More cleanup

Author: lrettig

.github/workflows/ci.yml

@@ -56,13 +56,8 @@ jobs:
           sudo apt update
           sudo apt-get -y install gcc-riscv64-unknown-elf
 
-      # default runner homebrew setup won't allow us to run `brew tap`
-      - name: Set up Homebrew
-        if: matrix.os == 'macos'
-        uses: Homebrew/actions/setup-homebrew@master
-
       - name: Install riscv-tools
-        if: matrix.os == 'macos'
+        if: matrix.runner == 'macos-13'
         run: |
           brew tap riscv-software-src/riscv
           brew install riscv-tools

build.sh

@@ -15,7 +15,6 @@ touch /tmp/riscv32em-athena-zkvm-elf.json
 # Set environment variables to override compiler flags
 export CC_riscv32em_athena_zkvm_elf="clang"
 export CXX_riscv32em_athena_zkvm_elf="clang++"
-#export AR_riscv32em_athena_zkvm_elf="ar"
 
 # Explicitly set CFLAGS without the problematic flags
 export CFLAGS_riscv32em_athena_zkvm_elf="-ffunction-sections -fdata-sections -fPIC -target riscv32-unknown-elf"

patches/config.ci.toml

@@ -8,8 +8,8 @@ configure-args = []
 cargo-native-static = true
 
 [target.riscv32em-athena-zkvm-elf]
-cc = "riscv64-unknown-elf-gcc"
-cxx = "riscv64-unknown-elf-g++"
+cc = "clang"
+cxx = "clang++"
 
 [rust]
 lld = true