fix(Risc-V toolchain): don't hardcode absolute path in /opt, assume i…

…nstallation added RISC-V toolchain in $PATH
taikoxyz · Jun 26, 2024 · faccbd7 · faccbd7
1 parent 546ab19
commit faccbd7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/provers/risc0/builder/src/main.rs b/provers/risc0/builder/src/main.rs
@@ -35,7 +35,7 @@ impl Pipeline for Risc0Pipeline {
             ])
             .cc_compiler("gcc".into())
             .c_flags(&[
-                "/opt/riscv/bin/riscv32-unknown-elf-gcc",
+                "riscv32-unknown-elf-gcc",
                 "-march=rv32im",
                 "-mstrict-align",
                 "-falign-functions=2",

diff --git a/provers/risc0/guest/src/mem.rs b/provers/risc0/guest/src/mem.rs
@@ -7,7 +7,7 @@ use std::{
 /// This implementation is designed to be used in ZkVM where we cross-compile Rust code with C
 /// due to the dependency of c-kzg. This modification also requires env var:
 ///     $ CC="gcc"
-///     $ CC_riscv32im-risc0-zkvm-elf="/opt/riscv/bin/riscv32-unknown-elf-gcc"
+///     $ CC_riscv32im-risc0-zkvm-elf="riscv32-unknown-elf-gcc"
 /// which is set in the build pipeline
 
 #[no_mangle]

diff --git a/provers/sp1/builder/src/main.rs b/provers/sp1/builder/src/main.rs
@@ -38,7 +38,7 @@ impl Pipeline for Sp1Pipeline {
             ])
             .cc_compiler("gcc".into())
             .c_flags(&[
-                "/opt/riscv/bin/riscv32-unknown-elf-gcc",
+                "riscv32-unknown-elf-gcc",
                 "-march=rv32im",
                 "-mstrict-align",
                 "-falign-functions=2",

diff --git a/provers/sp1/guest/src/mem.rs b/provers/sp1/guest/src/mem.rs
@@ -7,7 +7,7 @@ use std::{
 /// This implementation is designed to be used in ZkVM where we cross-compile Rust code with C
 /// due to the dependency of c-kzg. This modification also requires env var:
 ///     $ CC="gcc"
-///     $ CC_riscv32im-risc0-zkvm-elf="/opt/riscv/bin/riscv32-unknown-elf-gcc"
+///     $ CC_riscv32im-risc0-zkvm-elf="riscv32-unknown-elf-gcc"
 /// which is set in the build pipeline
 
 #[no_mangle]