Auto merge of #6300 - ehuss:out-dir-custom-build, r=alexcrichton

Don't include build scripts in --out-dir.

As I understand the `--out-dir` use cases, these shouldn't be needed.

Closes #6282

Author: bors

src/cargo/core/compiler/mod.rs

@@ -437,11 +437,13 @@ fn link_targets<'a, 'cfg>(
             destinations.push(dst.display().to_string());
             hardlink_or_copy(src, dst)?;
             if let Some(ref path) = export_dir {
-                if !path.exists() {
-                    fs::create_dir_all(path)?;
-                }
+                if !target.is_custom_build() {
+                    if !path.exists() {
+                        fs::create_dir_all(path)?;
+                    }
 
-                hardlink_or_copy(src, &path.join(dst.file_name().unwrap()))?;
+                    hardlink_or_copy(src, &path.join(dst.file_name().unwrap()))?;
+                }
             }
         }
 

tests/testsuite/out_dir.rs

@@ -203,6 +203,37 @@ fn replaces_artifacts() {
     .run();
 }
 
+#[test]
+fn avoid_build_scripts() {
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+            [workspace]
+            members = ["a", "b"]
+            "#,
+        )
+        .file("a/Cargo.toml", &basic_manifest("a", "0.0.1"))
+        .file("a/src/main.rs", "fn main() {}")
+        .file("a/build.rs", r#"fn main() { println!("hello-build-a"); }"#)
+        .file("b/Cargo.toml", &basic_manifest("b", "0.0.1"))
+        .file("b/src/main.rs", "fn main() {}")
+        .file("b/build.rs", r#"fn main() { println!("hello-build-b"); }"#)
+        .build();
+
+    p.cargo("build -Z unstable-options --out-dir out -vv")
+        .masquerade_as_nightly_cargo()
+        .with_stdout_contains("[a 0.0.1] hello-build-a")
+        .with_stdout_contains("[b 0.0.1] hello-build-b")
+        .run();
+    check_dir_contents(
+        &p.root().join("out"),
+        &["a", "b"],
+        &["a", "a.dSYM", "b", "b.dSYM"],
+        &["a.exe", "a.pdb", "b.exe", "b.pdb"],
+    );
+}
+
 fn check_dir_contents(
     out_dir: &Path,
     expected_linux: &[&str],