Skip to content

Commit

Permalink
Auto merge of #108302 - Kobzol:revert-107834, r=albertlarsan68
Browse files Browse the repository at this point in the history 
Revert #107834

This reverts commit [41c6c5d](#107834). Trying to check if this fixes building `rustc` for perf bot.
  • Loading branch information
@bors
bors committed Feb 21, 2023
2 parents 246eae2 + 6ca499b commit 375d5ac
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 86 deletions.
66 changes: 0 additions & 66 deletions src/bootstrap/compile.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,72 +459,6 @@ impl Step for StdLink {
let libdir = builder.sysroot_libdir(target_compiler, target);
let hostdir = builder.sysroot_libdir(target_compiler, compiler.host);
add_to_sysroot(builder, &libdir, &hostdir, &libstd_stamp(builder, compiler, target));

if compiler.stage == 0 {
// special handling for stage0, to make `rustup toolchain link` and `x dist --stage 0`
// work for stage0-sysroot
let sysroot = builder.out.join(&compiler.host.triple).join("stage0-sysroot");

let host_lib_dir = builder.initial_rustc.ancestors().nth(2).unwrap().join("lib");
let host_bin_dir = builder.out.join(&builder.initial_rustc.parent().unwrap());
let host_codegen_backends =
host_lib_dir.join("rustlib").join(&compiler.host.triple).join("codegen-backends");
let sysroot_bin_dir = sysroot.join("bin");
let sysroot_lib_dir = sysroot.join("lib");
let sysroot_codegen_backends = builder.sysroot_codegen_backends(compiler);

// Create the `bin` directory in stage0-sysroot
t!(fs::create_dir_all(&sysroot_bin_dir));

// copy bin files from `builder.initial_rustc/./` to `stage0-sysroot/bin`
if let Ok(files) = fs::read_dir(&host_bin_dir) {
for file in files {
let file = t!(file);
if file.file_name() == "rustfmt" {
// This is when `rustc` and `cargo` are set in `config.toml`
if !file.path().starts_with(&builder.out) {
builder.copy(
&file.path().into_boxed_path(),
&sysroot_bin_dir.join(file.file_name()),
);
} else {
builder.copy(
&builder
.out
.join(&compiler.host.triple)
.join("rustfmt/bin/rustfmt"),
&sysroot_bin_dir.join(file.file_name()),
);
}
} else {
builder.copy(
&file.path().into_boxed_path(),
&sysroot_bin_dir.join(file.file_name()),
);
}
}
}

// copy dylib files from `builder.initial_rustc/../lib/*` while excluding the `rustlib` directory to `stage0-sysroot/lib`
if let Ok(files) = fs::read_dir(&host_lib_dir) {
for file in files {
let file = t!(file);
let path = file.path();
if path.is_file()
&& is_dylib(&file.file_name().into_string().unwrap())
&& !path.starts_with(sysroot_lib_dir.join("rustlib").into_boxed_path())
{
builder.copy(&path, &sysroot_lib_dir.join(path.file_name().unwrap()));
}
}
}

t!(fs::create_dir_all(&sysroot_codegen_backends));
// copy `codegen-backends` from `host_lib_dir/rustlib/codegen_backends` to `stage0-sysroot/lib/rustlib/host-triple/codegen-backends` if it exists.
if host_codegen_backends.exists() {
builder.cp_r(&host_codegen_backends, &sysroot_codegen_backends);
}
}
}
}

Expand Down
19 changes: 1 addition & 18 deletions src/bootstrap/download.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::{
env,
ffi::{OsStr, OsString},
fs::{self, File},
io::{self, BufRead, BufReader, ErrorKind},
io::{BufRead, BufReader, ErrorKind},
path::{Path, PathBuf},
process::{Command, Stdio},
};
Expand All @@ -26,14 +26,6 @@ impl Config {
self.verbose > 0
}

pub fn symlink_file<P: AsRef<Path>, Q: AsRef<Path>>(&self, src: P, link: Q) -> io::Result<()> {
#[cfg(unix)]
use std::os::unix::fs::symlink as symlink_file;
#[cfg(windows)]
use std::os::windows::fs::symlink_file;
if !self.dry_run() { symlink_file(src.as_ref(), link.as_ref()) } else { Ok(()) }
}

pub(crate) fn create(&self, path: &Path, s: &str) {
if self.dry_run() {
return;
Expand Down Expand Up @@ -338,15 +330,6 @@ impl Config {
let bin_root = self.out.join(host.triple).join("rustfmt");
let rustfmt_path = bin_root.join("bin").join(exe("rustfmt", host));
let rustfmt_stamp = bin_root.join(".rustfmt-stamp");

#[cfg(not(windows))]
{
let legacy_rustfmt = self.initial_rustc.with_file_name(exe("rustfmt", host));
if !legacy_rustfmt.exists() {
t!(self.symlink_file(&rustfmt_path, &legacy_rustfmt));
}
}

if rustfmt_path.exists() && !program_out_of_date(&rustfmt_stamp, &channel) {
return Some(rustfmt_path);
}
Expand Down
11 changes: 10 additions & 1 deletion src/bootstrap/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use std::cell::{Cell, RefCell};
use std::collections::{HashMap, HashSet};
use std::env;
use std::fs::{self, File};
use std::io;
use std::io::ErrorKind;
use std::path::{Path, PathBuf};
use std::process::{Command, Stdio};
Expand Down Expand Up @@ -1406,7 +1407,7 @@ impl Build {
src = t!(fs::canonicalize(src));
} else {
let link = t!(fs::read_link(src));
t!(self.config.symlink_file(link, dst));
t!(self.symlink_file(link, dst));
return;
}
}
Expand Down Expand Up @@ -1524,6 +1525,14 @@ impl Build {
iter.map(|e| t!(e)).collect::<Vec<_>>().into_iter()
}

fn symlink_file<P: AsRef<Path>, Q: AsRef<Path>>(&self, src: P, link: Q) -> io::Result<()> {
#[cfg(unix)]
use std::os::unix::fs::symlink as symlink_file;
#[cfg(windows)]
use std::os::windows::fs::symlink_file;
if !self.config.dry_run() { symlink_file(src.as_ref(), link.as_ref()) } else { Ok(()) }
}

/// Returns if config.ninja is enabled, and checks for ninja existence,
/// exiting with a nicer error message if not.
fn ninja(&self) -> bool {
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/native.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ impl Step for Llvm {

let lib_llvm = out_dir.join("build").join("lib").join(lib_name);
if !lib_llvm.exists() {
t!(builder.build.config.symlink_file("libLLVM.dylib", &lib_llvm));
t!(builder.symlink_file("libLLVM.dylib", &lib_llvm));
}
}

Expand Down

0 comments on commit 375d5ac

Please sign in to comment.