Ensure RUSTC_WRAPPER isn't set if no wrapper is used

Jon Gjengset · Jon Gjengset · commit 055a2431aa05 · 2021-06-25T09:23:26.000-07:00
diff --git a/src/cargo/core/compiler/custom_build.rs b/src/cargo/core/compiler/custom_build.rs
@@ -252,6 +252,8 @@ fn build_work(cx: &mut Context<'_, '_>, unit: &Unit) -> CargoResult<Job> {
     // Also inform the build script of the rustc compiler context.
     if let Some(wrapper) = bcx.rustc().wrapper.as_ref() {
         cmd.env("RUSTC_WRAPPER", wrapper);
+    } else {
+        cmd.env_remove("RUSTC_WRAPPER");
     }
     cmd.env("RUSTFLAGS", bcx.rustflags_args(unit).join(" "));
     let version = crate::version();

Original file line number	Diff line number	Diff line change
`@@ -252,6 +252,8 @@ fn build_work(cx: &mut Context<'_, '_>, unit: &Unit) -> CargoResult<Job> {`
`252`	`252`	`// Also inform the build script of the rustc compiler context.`
`253`	`253`	`if let Some(wrapper) = bcx.rustc().wrapper.as_ref() {`
`254`	`254`	`cmd.env("RUSTC_WRAPPER", wrapper);`
	`255`	`+ } else {`
	`256`	`+ cmd.env_remove("RUSTC_WRAPPER");`
`255`	`257`	`}`
`256`	`258`	`cmd.env("RUSTFLAGS", bcx.rustflags_args(unit).join(" "));`
`257`	`259`	`let version = crate::version();`