From 5ec7d3bd6bce80d2b48022c7e4c55ebd567b0a27 Mon Sep 17 00:00:00 2001
From: Yan Peng <yppe@amazon.com>
Date: Tue, 20 Aug 2024 21:34:48 +0000
Subject: [PATCH] AWS-LC build on MacOS-14 is currently failing

---
 .github/workflows/makefile.yml | 15 +++++++++++++--
 scripts/build_awslc.sh         | 28 ++++++++++++++++++++++------
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
index fa85af3f..7e48f7d8 100644
--- a/.github/workflows/makefile.yml
+++ b/.github/workflows/makefile.yml
@@ -43,11 +43,22 @@ jobs:
         path: .lake
         key: ${{ runner.os }}-lake
 
-    - name: Build AWS-LC (MacOS)
-      if : ${{ runner.os == 'macOS' }}
+    - name: Setup Go
+      # if: ${{ runner.os == 'macOS' }}
+      uses: actions/setup-go@v4
+      with:
+          go-version: '>=1.18'
+
+    - name: Build AWS-LC
+      # if : ${{ runner.os == 'macOS' }}
       run: |
           ./scripts/build_awslc.sh
 
+    # - name: Run ELFLoader Tests for AWS-LC (MacOS)
+    #   if : ${{ runner.os == 'macOS' }}
+    #   run: |
+    #       make awslc_elftests
+
     - name: Run LNSym Makefile (Ubuntu)
       if : ${{ runner.os != 'macOS' }}
       run: |
diff --git a/scripts/build_awslc.sh b/scripts/build_awslc.sh
index bddcb1b1..402b547a 100755
--- a/scripts/build_awslc.sh
+++ b/scripts/build_awslc.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright (c) 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # Released under Apache 2.0 license as described in the file LICENSE.
@@ -9,17 +9,33 @@ set -o xtrace
 
 # Remember where LNSym is
 LNSym_DIR=${PWD}
+export CC=clang; export CXX=clang++
+echo $CC
+echo $CXX
+clang --version
+gcc --version
+
+echo ""
+echo "Environment variables:"
+env
 
 # Install dependencies
-brew install ninja golang
+KERNEL_NAME=$(uname -s)
+if [[ "${KERNEL_NAME}" == "Darwin" ]]; then
+  brew install ninja
+else
+  apt-get update
+  apt-get install -y cmake clang ninja-build
+fi
 
-# Fetching and building AWS-LC
+# Fetching AWS-LC
 git clone https://github.com/aws/aws-lc.git $HOME/aws-lc --depth 1
-cd $HOME/aws-lc; mkdir aws-lc-build; cd aws-lc-build
+cd $HOME/aws-lc
+# Build AWS-LC
+mkdir aws-lc-build; cd aws-lc-build
 cmake -GNinja -DKEEP_ASM_LOCAL_SYMBOLS=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo ../
+# cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo ../
 ninja
 
 # Move crypto_test to LNSym
 cp -f crypto/crypto_test ${LNSym_DIR}/Tests/ELFParser/Data/crypto_test
-
-cd ${LNSym_DIR}