Skip to content

Commit 90c361c

Browse files
authored
Rollup merge of rust-lang#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.
2 parents 1dc4b40 + a2ab47f commit 90c361c

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/bootstrap/compile.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -1358,7 +1358,12 @@ impl Step for Sysroot {
13581358
// newly compiled std, not the downloaded std.
13591359
add_filtered_files("lib", builder.config.ci_rust_std_contents());
13601360

1361-
let filtered_extensions = [OsStr::new("rmeta"), OsStr::new("rlib"), OsStr::new("so")];
1361+
let filtered_extensions = [
1362+
OsStr::new("rmeta"),
1363+
OsStr::new("rlib"),
1364+
// FIXME: this is wrong when compiler.host != build, but we don't support that today
1365+
OsStr::new(std::env::consts::DLL_EXTENSION),
1366+
];
13621367
let ci_rustc_dir = builder.ci_rustc_dir(builder.config.build);
13631368
builder.cp_filtered(&ci_rustc_dir, &sysroot, &|path| {
13641369
if path.extension().map_or(true, |ext| !filtered_extensions.contains(&ext)) {

0 commit comments

Comments
 (0)