diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2023-06-07 18:01:31 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-07 18:01:31 +0530 |
| commit | 90c361c8376e8ec9d63cbd78b6d68c9647eb32c1 (patch) | |
| tree | f8861cada9423965104c8fb57a7dbfdf1cd68a15 | |
| parent | 1dc4b4001fe3809535b9405b55e281a42608fb77 (diff) | |
| parent | a2ab47f1e57a7192bbdb7f6e90e7776a458b3315 (diff) | |
| download | rust-90c361c8376e8ec9d63cbd78b6d68c9647eb32c1.tar.gz rust-90c361c8376e8ec9d63cbd78b6d68c9647eb32c1.zip | |
Rollup merge of #112382 - jyn514:test-download-rustc-macos, r=albertlarsan68
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.rs | 7 |
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)) { |