about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbjorn3 <17426603+bjorn3@users.noreply.github.com>2025-03-31 15:09:43 +0000
committerbjorn3 <17426603+bjorn3@users.noreply.github.com>2025-04-03 08:53:15 +0000
commitfadea8e0ba18f1e6a33720451943f079caad0856 (patch)
tree6c9cebe88ec3de3dabc044390e8bd5637d8586a7
parentb6d74b5e15b0d479a98b8b18bb70050511108882 (diff)
downloadrust-fadea8e0ba18f1e6a33720451943f079caad0856.tar.gz
rust-fadea8e0ba18f1e6a33720451943f079caad0856.zip
Unset RUSTC_WRAPPER in cg_clif's build system
-rw-r--r--compiler/rustc_codegen_cranelift/build_system/utils.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_cranelift/build_system/utils.rs b/compiler/rustc_codegen_cranelift/build_system/utils.rs
index c2114caf869..f2399768459 100644
--- a/compiler/rustc_codegen_cranelift/build_system/utils.rs
+++ b/compiler/rustc_codegen_cranelift/build_system/utils.rs
@@ -105,7 +105,11 @@ impl CargoProject {
             .arg(self.manifest_path(dirs))
             .arg("--target-dir")
             .arg(self.target_dir(dirs))
-            .arg("--locked");
+            .arg("--locked")
+            // bootstrap sets both RUSTC and RUSTC_WRAPPER to the same wrapper. RUSTC is already
+            // respected by the rustc-clif wrapper, but RUSTC_WRAPPER will misinterpret rustc-clif
+            // as filename, so we need to unset it.
+            .env_remove("RUSTC_WRAPPER");
 
         if dirs.frozen {
             cmd.arg("--frozen");