Update to match Athena changes

See athenavm/athena#91
athenavm · Aug 15, 2024 · 0822b40 · 0822b40
1 parent 636c637
commit 0822b40
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/build.sh b/build.sh
@@ -17,7 +17,13 @@ export RUST_TARGET_PATH="/tmp"
 export CFLAGS_riscv32em_athena_zkvm_elf="-ffunction-sections -fdata-sections -fPIC -target riscv32-unknown-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"
+export COMPILER_RT_DEFAULT_TARGET_TRIPLE="riscv32-unknown-elf"
+export CC_riscv32em_athena_zkvm_elf="clang"
+export CXX_riscv32em_athena_zkvm_elf="clang++"
+
+# Prevent the build system from adding --target flag
+export RUSTC_TARGET_ARG=""
 
 # Will create component archives (dists) ./rust/build/dist
 cd rust

diff --git a/patch.sh b/patch.sh
@@ -3,5 +3,5 @@
 set -euo pipefail
 
 cd rust
-patch -p1 < ../patches/rust.patch
+patch -N -p1 < ../patches/rust.patch
 cp ../patches/config.toml ./