Update cache strategy, simplify further

Author: lrettig

.github/workflows/ci.yml

@@ -65,13 +65,17 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             athena/target/
-          key: ${{ matrix.os }}-athenabuild-${{ hashFiles('athena/**/Cargo.lock') }}
+          key: ${{ matrix.os }}-athenabuild-${{ hashFiles('athena/**/Cargo.toml') }}
 
       - uses: actions/cache@v4
         name: Cache Rust toolchain
         with:
           path: |
-            toolchain/rust/
+            toolchain/rust/build
+            toolchain/rust/library
+            toolchain/rust/src/doc
+            toolchain/rust/src/llvm-project
+            toolchain/rust/src/tools
           key: ${{ matrix.os }}-rusttoolchain-${{ env.RUST_COMMIT }}
 
       - name: Build

build.sh

@@ -13,23 +13,14 @@ need_cmd clang++
 touch /tmp/riscv32em-athena-zkvm-elf.json
 export RUST_TARGET_PATH="/tmp"
 
-# Set environment variables to override compiler flags
-#export CC_riscv32em_athena_zkvm_elf="clang"
-#export CXX_riscv32em_athena_zkvm_elf="clang++"
-
 # Explicitly set CFLAGS without the problematic flags
 export CFLAGS_riscv32em_athena_zkvm_elf="-ffunction-sections -fdata-sections -fPIC -target riscv32-unknown-elf"
-#export CXXFLAGS_riscv32em_athena_zkvm_elf="$CFLAGS_riscv32em_athena_zkvm_elf"
 
 # Set Rust flags
 export CARGO_TARGET_RISCV32EM_ATHENA_ZKVM_ELF_RUSTFLAGS="-Cpasses=loweratomic"
-# export CARGO_TARGET_RISCV32EM_ATHENA_ZKVM_ELF_RUSTFLAGS="-Cpasses=loweratomic -Clink-arg=-march=rv32em -Clink-arg=-mabi=ilp32e"
-
-# Override the default target for compiler-rt
-# export COMPILER_RT_DEFAULT_TARGET_TRIPLE="riscv32-unknown-elf"
 
 # Prevent the build system from adding --target flag
-export RUSTC_TARGET_ARG=""
+#export RUSTC_TARGET_ARG=""
 
 # Will create component archives (dists) ./rust/build/dist
 cd rust