bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #96905 - jyn514:revert-96803-faster-assemble, r=Mark-Simulacrum

Browse source 
Revert "Make "Assemble stage1 compiler" orders of magnitude faster"

Reverts rust-lang/rust#96803. This caused `llvm-tools-nightly` to fail when installing with `rustup-toolchain-install-master` because of the presence of symlinks. I'm not sure how the symlinks got in there, but revert the PR for now while I figure it out.

r? `@Mark-Simulacrum` cc `@RalfJung`
This commit is contained in:
bors 2022-05-10 18:26:31 +00:00
commit fee75fbe11
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/bootstrap/lib.rs
View file

@ -1497,14 +1497,20 @@ impl Build {
let dst = dstdir.join(src.file_name().unwrap());
self.verbose_than(1, &format!("Install {:?} to {:?}", src, dst));
t!(fs::create_dir_all(dstdir));
drop(fs::remove_file(&dst));
{
if !src.exists() {
panic!("Error: File \"{}\" not found!", src.display());
}
self.copy(src, &dst);
let metadata = t!(src.symlink_metadata());
if let Err(e) = fs::copy(&src, &dst) {
panic!("failed to copy `{}` to `{}`: {}", src.display(), dst.display(), e)
}
t!(fs::set_permissions(&dst, metadata.permissions()));
let atime = FileTime::from_last_access_time(&metadata);
let mtime = FileTime::from_last_modification_time(&metadata);
t!(filetime::set_file_times(&dst, atime, mtime));
}
// NOTE: when using hard-links, this will also update the permissions on the original file.
// We never use permissions that are more restrictive than the original, so this shouldn't cause any issues.
chmod(&dst, perms);
}