about summary refs log tree commit diff
diff options
context:
space:
mode:
authorjyn <jyn.nelson@redjack.com>2023-06-07 05:53:26 -0500
committerjyn <jyn.nelson@redjack.com>2023-06-07 06:16:30 -0500
commita2ab47f1e57a7192bbdb7f6e90e7776a458b3315 (patch)
tree9d827c0ab4a0f38585717e5f760ada8df8e741b7
parent10b7e468f3cc263b8df8ff0212d0911ed5a3c090 (diff)
downloadrust-a2ab47f1e57a7192bbdb7f6e90e7776a458b3315.tar.gz
rust-a2ab47f1e57a7192bbdb7f6e90e7776a458b3315.zip
download-rustc: Fix `x test core` on MacOS
before, this hardcoded `.so` as the extension for dynamically linked objects, which is incorrect
everywhere except linux
-rw-r--r--src/bootstrap/compile.rs7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index 48685f7a9d5..a9e15d89246 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@ -1358,7 +1358,12 @@ impl Step for Sysroot {
             // newly compiled std, not the downloaded std.
             add_filtered_files("lib", builder.config.ci_rust_std_contents());
 
-            let filtered_extensions = [OsStr::new("rmeta"), OsStr::new("rlib"), OsStr::new("so")];
+            let filtered_extensions = [
+                OsStr::new("rmeta"),
+                OsStr::new("rlib"),
+                // FIXME: this is wrong when compiler.host != build, but we don't support that today
+                OsStr::new(std::env::consts::DLL_EXTENSION),
+            ];
             let ci_rustc_dir = builder.ci_rustc_dir(builder.config.build);
             builder.cp_filtered(&ci_rustc_dir, &sysroot, &|path| {
                 if path.extension().map_or(true, |ext| !filtered_extensions.contains(&ext)) {