refactor: improve cargo build reproducibility (#1647)

Co-authored-by: François Garillot <francois@garillot.net>
succinctlabs · Oct 16, 2024 · ad3a034 · ad3a034
1 parent 3d91a90
commit ad3a034
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/crates/build/src/command/docker.rs b/crates/build/src/command/docker.rs
@@ -81,6 +81,9 @@ pub(crate) fn create_docker_command(
         format!("CARGO_TARGET_DIR={}", target_dir),
         "-e".to_string(),
         "RUSTUP_TOOLCHAIN=succinct".to_string(),
+        // TODO: remove once trim-paths is supported - https://github.com/rust-lang/rust/issues/111540
+        "-e".to_string(),
+        "RUSTC_BOOTSTRAP=1".to_string(), // allows trim-paths.
         "-e".to_string(),
         format!("CARGO_ENCODED_RUSTFLAGS={}", get_rust_compiler_flags()),
         "--entrypoint".to_string(),

diff --git a/crates/build/src/command/local.rs b/crates/build/src/command/local.rs
@@ -42,6 +42,8 @@ pub(crate) fn create_local_command(
         .env("CARGO_ENCODED_RUSTFLAGS", get_rust_compiler_flags())
         .env_remove("RUSTC")
         .env("CARGO_TARGET_DIR", program_metadata.target_directory.join(HELPER_TARGET_SUBDIR))
+        // TODO: remove once trim-paths is supported - https://github.com/rust-lang/rust/issues/111540
+        .env("RUSTC_BOOTSTRAP", "1") // allows trim-paths.
         .args(get_program_build_args(args));
     command
 }
diff --git a/crates/build/src/command/utils.rs b/crates/build/src/command/utils.rs
@@ -20,6 +20,8 @@ pub(crate) fn get_program_build_args(args: &BuildArgs) -> Vec<String> {
         build_args.push("--ignore-rust-version".to_string());
     }
 
+    build_args.push("-Ztrim-paths".to_string());
+
     if !args.binary.is_empty() {
         build_args.push("--bin".to_string());
         build_args.push(args.binary.clone());