Inform build scripts of rustc compiler context

Jon Gjengset · Jon Gjengset · commit 6ee606be69c7 · 2021-06-18T11:49:15.000-07:00
Fixes #9600.
diff --git a/src/cargo/core/compiler/custom_build.rs b/src/cargo/core/compiler/custom_build.rs
@@ -249,6 +249,13 @@ fn build_work(cx: &mut Context<'_, '_>, unit: &Unit) -> CargoResult<Job> {
         }
     }
 
+    // Also inform the build script of the rustc compiler context.
+    cmd.env(
+        "CARGO_RUSTC_WRAPPER",
+        bcx.rustc().wrapper.as_deref().unwrap_or(Path::new("")),
+    );
+    cmd.env("CARGO_RUSTFLAGS", bcx.rustflags_args(unit).join(" "));
+
     // Gather the set of native dependencies that this package has along with
     // some other variables to close over.
     //

Original file line number	Diff line number	Diff line change
`@@ -249,6 +249,13 @@ fn build_work(cx: &mut Context<'_, '_>, unit: &Unit) -> CargoResult<Job> {`
`249`	`249`	`}`
`250`	`250`	`}`
`251`	`251`
	`252`	`+ // Also inform the build script of the rustc compiler context.`
	`253`	`+ cmd.env(`
	`254`	`+ "CARGO_RUSTC_WRAPPER",`
	`255`	`+ bcx.rustc().wrapper.as_deref().unwrap_or(Path::new("")),`
	`256`	`+ );`
	`257`	`+ cmd.env("CARGO_RUSTFLAGS", bcx.rustflags_args(unit).join(" "));`
	`258`	`+`
`252`	`259`	`// Gather the set of native dependencies that this package has along with`
`253`	`260`	`// some other variables to close over.`
`254`	`261`	`//`