From ae3f8109f740754cf825c533d99103f3d198f47b Mon Sep 17 00:00:00 2001
From: Jonathan Cubides <jonathan.cubides@uib.no>
Date: Tue, 21 Mar 2023 17:28:45 +0100
Subject: [PATCH 1/2] fix macos build

---
 .github/workflows/ci.yml | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e45b68ef6d..d0f29e97fd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -241,17 +241,11 @@ jobs:
           path: main
           submodules: true
 
-      - name: Set homebrew LLVM CC and LIBTOOL vars (macOS)
-        run: |
-          echo "CC=$(brew --prefix llvm)/bin/clang" >> $GITHUB_ENV
-          echo "LIBTOOL=$(brew --prefix llvm)/bin/llvm-ar" >> $GITHUB_ENV
-
       - name: Install ICU4C
         run: |
           brew install icu4c
           brew link icu4c --force
 
-
       - name: Download and extract wasi-sysroot
         run: >
           curl
@@ -272,15 +266,6 @@ jobs:
           binaries-location: bin
           cache: true
 
-      - name: Set homebrew LLVM CC and LIBTOOL vars (macOS)
-        run: |
-          echo "CC=$(brew --prefix llvm)/bin/clang" >> $GITHUB_ENV
-          echo "LIBTOOL=$(brew --prefix llvm)/bin/llvm-ar" >> $GITHUB_ENV
-
-      - name: Add homebrew clang to the PATH (macOS)
-        run: |
-          echo "$(brew --prefix llvm)/bin" >> $GITHUB_PATH
-
       - name: Make runtime
         run: |
           cd main
@@ -292,6 +277,15 @@ jobs:
           working-directory: main
           test: false
 
+      - name: Set homebrew LLVM CC and LIBTOOL vars (macOS)
+        run: |
+          echo "CC=$(brew --prefix llvm)/bin/clang" >> $GITHUB_ENV
+          echo "LIBTOOL=$(brew --prefix llvm)/bin/llvm-ar" >> $GITHUB_ENV
+
+      - name: Add homebrew clang to the PATH (macOS)
+        run: |
+          echo "$(brew --prefix llvm)/bin" >> $GITHUB_PATH
+
       - name: Test suite (macOS)
         if: ${{ success() }}
         run: |

From 3ddc80cb1746cdc4e663eabbda0f49f7419d017d Mon Sep 17 00:00:00 2001
From: Paul Cadman <git@paulcadman.dev>
Date: Tue, 21 Mar 2023 17:08:10 +0000
Subject: [PATCH 2/2] Set CC and LIBTOOl vars before trying to build runtime

---
 .github/workflows/ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d0f29e97fd..469e8dbfa8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -266,6 +266,11 @@ jobs:
           binaries-location: bin
           cache: true
 
+      - name: Set homebrew LLVM CC and LIBTOOL vars (macOS)
+        run: |
+          echo "CC=$(brew --prefix llvm)/bin/clang" >> $GITHUB_ENV
+          echo "LIBTOOL=$(brew --prefix llvm)/bin/llvm-ar" >> $GITHUB_ENV
+
       - name: Make runtime
         run: |
           cd main
@@ -277,11 +282,6 @@ jobs:
           working-directory: main
           test: false
 
-      - name: Set homebrew LLVM CC and LIBTOOL vars (macOS)
-        run: |
-          echo "CC=$(brew --prefix llvm)/bin/clang" >> $GITHUB_ENV
-          echo "LIBTOOL=$(brew --prefix llvm)/bin/llvm-ar" >> $GITHUB_ENV
-
       - name: Add homebrew clang to the PATH (macOS)
         run: |
           echo "$(brew --prefix llvm)/bin" >> $GITHUB_PATH