Skip to content

Commit 6ca499b

Browse files
committed
Revert "Copy bin/* and lib/*.dylib files to stage0-sysroot"
This reverts commit 6990ab9.
1 parent a5d2731 commit 6ca499b

File tree

1 file changed

+0
-66
lines changed

1 file changed

+0
-66
lines changed

src/bootstrap/compile.rs

-66
Original file line numberDiff line numberDiff line change
@@ -459,72 +459,6 @@ impl Step for StdLink {
459459
let libdir = builder.sysroot_libdir(target_compiler, target);
460460
let hostdir = builder.sysroot_libdir(target_compiler, compiler.host);
461461
add_to_sysroot(builder, &libdir, &hostdir, &libstd_stamp(builder, compiler, target));
462-
463-
if compiler.stage == 0 {
464-
// special handling for stage0, to make `rustup toolchain link` and `x dist --stage 0`
465-
// work for stage0-sysroot
466-
let sysroot = builder.out.join(&compiler.host.triple).join("stage0-sysroot");
467-
468-
let host_lib_dir = builder.initial_rustc.ancestors().nth(2).unwrap().join("lib");
469-
let host_bin_dir = builder.out.join(&builder.initial_rustc.parent().unwrap());
470-
let host_codegen_backends =
471-
host_lib_dir.join("rustlib").join(&compiler.host.triple).join("codegen-backends");
472-
let sysroot_bin_dir = sysroot.join("bin");
473-
let sysroot_lib_dir = sysroot.join("lib");
474-
let sysroot_codegen_backends = builder.sysroot_codegen_backends(compiler);
475-
476-
// Create the `bin` directory in stage0-sysroot
477-
t!(fs::create_dir_all(&sysroot_bin_dir));
478-
479-
// copy bin files from `builder.initial_rustc/./` to `stage0-sysroot/bin`
480-
if let Ok(files) = fs::read_dir(&host_bin_dir) {
481-
for file in files {
482-
let file = t!(file);
483-
if file.file_name() == "rustfmt" {
484-
// This is when `rustc` and `cargo` are set in `config.toml`
485-
if !file.path().starts_with(&builder.out) {
486-
builder.copy(
487-
&file.path().into_boxed_path(),
488-
&sysroot_bin_dir.join(file.file_name()),
489-
);
490-
} else {
491-
builder.copy(
492-
&builder
493-
.out
494-
.join(&compiler.host.triple)
495-
.join("rustfmt/bin/rustfmt"),
496-
&sysroot_bin_dir.join(file.file_name()),
497-
);
498-
}
499-
} else {
500-
builder.copy(
501-
&file.path().into_boxed_path(),
502-
&sysroot_bin_dir.join(file.file_name()),
503-
);
504-
}
505-
}
506-
}
507-
508-
// copy dylib files from `builder.initial_rustc/../lib/*` while excluding the `rustlib` directory to `stage0-sysroot/lib`
509-
if let Ok(files) = fs::read_dir(&host_lib_dir) {
510-
for file in files {
511-
let file = t!(file);
512-
let path = file.path();
513-
if path.is_file()
514-
&& is_dylib(&file.file_name().into_string().unwrap())
515-
&& !path.starts_with(sysroot_lib_dir.join("rustlib").into_boxed_path())
516-
{
517-
builder.copy(&path, &sysroot_lib_dir.join(path.file_name().unwrap()));
518-
}
519-
}
520-
}
521-
522-
t!(fs::create_dir_all(&sysroot_codegen_backends));
523-
// copy `codegen-backends` from `host_lib_dir/rustlib/codegen_backends` to `stage0-sysroot/lib/rustlib/host-triple/codegen-backends` if it exists.
524-
if host_codegen_backends.exists() {
525-
builder.cp_r(&host_codegen_backends, &sysroot_codegen_backends);
526-
}
527-
}
528462
}
529463
}
530464

0 commit comments

Comments
 (0)