Add environment variables for accessing the OUT_DIR

Author: namanlp

src/cargo/core/compiler/mod.rs

@@ -1706,10 +1706,15 @@ fn build_deps_args(
 
     for dep in deps {
         if dep.unit.mode.is_run_custom_build() {
-            cmd.env(
-                "OUT_DIR",
-                &build_runner.files().build_script_out_dir(&dep.unit),
-            );
+            let out_dir = &build_runner.files().build_script_out_dir(&dep.unit);
+            let mut out_dir_name = dep.unit.target.name().to_owned();
+            out_dir_name = out_dir_name
+                .strip_prefix("build-script-")
+                .unwrap_or(&out_dir_name)
+                .to_string();
+            out_dir_name.push_str("_OUT_DIR");
+            cmd.env("OUT_DIR", &out_dir);
+            cmd.env(&out_dir_name, &out_dir);
         }
     }
 

tests/testsuite/build_scripts_multiple.rs

@@ -549,7 +549,7 @@ fn build_script_with_conflicting_out_dirs() {
                 build = ["build1.rs", "build2.rs"]
             "#,
         )
-        // OUT_DIR is set to the lexicographically largest build script's OUT_DIR by default
+        // By default, OUT_DIR is set to that of the last build script in the array
         .file(
             "src/main.rs",
             r#"
@@ -628,7 +628,7 @@ fn build_script_with_conflicts_reverse_sorted() {
                 build = ["build2.rs", "build1.rs"]
             "#,
         )
-        // OUT_DIR is set to the lexicographically largest build script's OUT_DIR by default
+        // By default, OUT_DIR is set to that of the last build script in the array
         .file(
             "src/main.rs",
             r#"
@@ -785,9 +785,11 @@ fn multiple_out_dirs() {
         .file(
             "src/main.rs",
             r#"
-                include!(concat!(env!("OUT_DIR"), "/foo.rs"));
+                include!(concat!(env!("build1_OUT_DIR"), "/foo.rs"));
+                include!(concat!(env!("build2_OUT_DIR"), "/foo.rs"));
                 fn main() {
-                    println!("{}", message());
+                    println!("{}", message1());
+                    println!("{}", message2());
                 }
             "#,
         )
@@ -803,7 +805,7 @@ fn multiple_out_dirs() {
                 let dest_path = Path::new(&out_dir).join("foo.rs");
                 fs::write(
                     &dest_path,
-                    "pub fn message() -> &'static str {
+                    "pub fn message1() -> &'static str {
                         \"Hello, from Build Script 1!\"
                     }
                     "
@@ -822,7 +824,7 @@ fn multiple_out_dirs() {
                 let dest_path = Path::new(&out_dir).join("foo.rs");
                 fs::write(
                     &dest_path,
-                    "pub fn message() -> &'static str {
+                    "pub fn message2() -> &'static str {
                         \"Hello, from Build Script 2!\"
                     }
                     "
@@ -835,6 +837,7 @@ fn multiple_out_dirs() {
         .masquerade_as_nightly_cargo(&["multiple-build-scripts"])
         .with_status(0)
         .with_stdout_data(str![[r#"
+Hello, from Build Script 1!
 Hello, from Build Script 2!
 
 "#]])