diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 743c1447..9c557565 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -52,6 +52,7 @@ jobs:
             wget https://apt.llvm.org/llvm.sh
             sudo chmod +x ./llvm.sh
             sudo ./llvm.sh 18
+            echo "/usr/lib/llvm-18/bin" >> $GITHUB_PATH
       shell: bash
     - name: Install compiler
       id: install_cc
@@ -319,6 +320,7 @@ jobs:
           PARALLEL: ${{ env.PARALLEL }}
         # Append custom commands here
         run: |
+          export PATH=/usr/lib/llvm-18/bin:$PATH
           make artifact
           make $PARALLEL
           make check $PARALLEL
@@ -342,6 +344,7 @@ jobs:
              brew install make dtc expect sdl2 sdl2_mixer bc e2fsprogs p7zip llvm@18 dcfldd
              .ci/riscv-toolchain-install.sh
              echo "${{ github.workspace }}/toolchain/bin" >> $GITHUB_PATH
+             echo "$(brew --prefix llvm@18)/bin" >> $GITHUB_PATH
      - name: Install compiler
        id: install_cc
        uses: rlalik/setup-cpp-compiler@master
diff --git a/Makefile b/Makefile
index cbadd03a..b123215a 100644
--- a/Makefile
+++ b/Makefile
@@ -115,6 +115,9 @@ ENABLE_EXT_F ?= 1
 $(call set-feature, EXT_F)
 ifeq ($(call has, EXT_F), 1)
 AR := ar
+ifeq ("$(CC_IS_CLANG)", "1")
+AR = llvm-ar
+endif
 ifeq ("$(CC_IS_EMCC)", "1")
 AR = emar
 endif