about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2017-02-03 17:12:58 -0800
committerAlex Crichton <alex@alexcrichton.com>2017-03-09 07:00:13 -0800
commit3be02fc41032febc28e22a8a41ec7dc85ca1ce19 (patch)
tree1a4a6224edacd3a07a3cdeb54576c8c0cd036a95 /src
parent3087a1f39eaeac9d76c8b159dcc64de515bb2b83 (diff)
downloadrust-3be02fc41032febc28e22a8a41ec7dc85ca1ce19.tar.gz
rust-3be02fc41032febc28e22a8a41ec7dc85ca1ce19.zip
rustbuild: Use copies instead of hard links
The original motivation for hard links was to speed up the various stages of
rustbuild, but in the end this is causing problems on Windows (#39504).

This commit tweaks the build system to use copies instead of hard links
unconditionally to ensure that the files accessed by Windows are always
disjoint.

Locally this added .3s to a noop build, so it shouldn't be too much of a
regression hopefully!
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/util.rs12
-rw-r--r--src/stage0.txt2
2 files changed, 11 insertions, 3 deletions
diff --git a/src/bootstrap/util.rs b/src/bootstrap/util.rs
index 520514f5fc9..fc63655d79b 100644
--- a/src/bootstrap/util.rs
+++ b/src/bootstrap/util.rs
@@ -20,6 +20,8 @@ use std::path::{Path, PathBuf};
 use std::process::Command;
 use std::time::Instant;
 
+use filetime::{self, FileTime};
+
 /// Returns the `name` as the filename of a static library for `target`.
 pub fn staticlib(name: &str, target: &str) -> String {
     if target.contains("windows") {
@@ -38,12 +40,18 @@ pub fn copy(src: &Path, dst: &Path) {
 
     // Attempt to "easy copy" by creating a hard link (symlinks don't work on
     // windows), but if that fails just fall back to a slow `copy` operation.
-    let res = fs::hard_link(src, dst);
-    let res = res.or_else(|_| fs::copy(src, dst).map(|_| ()));
+    // let res = fs::hard_link(src, dst);
+    let res = fs::copy(src, dst);
     if let Err(e) = res {
         panic!("failed to copy `{}` to `{}`: {}", src.display(),
                dst.display(), e)
     }
+    let metadata = t!(src.metadata());
+    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));
+
 }
 
 /// Copies the `src` directory recursively to `dst`. Both are assumed to exist
diff --git a/src/stage0.txt b/src/stage0.txt
index cda9a5a9643..772029ab0c2 100644
--- a/src/stage0.txt
+++ b/src/stage0.txt
@@ -13,4 +13,4 @@
 # released on `$date`
 
 rustc: beta-2017-02-01
-cargo: bfee18f73287687c543bda8c35e4e33808792715
+cargo: 407edef22e894266eb562618cba5ca9757051946