about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-01-04 01:51:06 +0000
committerbors <bors@rust-lang.org>2017-01-04 01:51:06 +0000
commita68622c899883b9871b71d5ed600166e2254d230 (patch)
tree97acb7416ff621cbb0f37fd2e4c6b31a30d4b09f
parent468227129d08b52c4cf90313b29fdad1b80e596b (diff)
parent3ab778b4afc1c11e48dd8b1f82c5dca9c897bcba (diff)
downloadrust-a68622c899883b9871b71d5ed600166e2254d230.tar.gz
rust-a68622c899883b9871b71d5ed600166e2254d230.zip
Auto merge of #38809 - alexcrichton:rustbuild-fresh, r=brson
rustbuild: Fix a few rebuilding issues

Did a bit of investigation and found a few small unrelated issues, but this should help clean up a lot of errors we've been seeing locally.
-rw-r--r--src/bootstrap/compile.rs7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index a7633998aad..31f8754d209 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@ -258,11 +258,6 @@ fn compiler_file(compiler: &Path, file: &str) -> PathBuf {
 }
 
 pub fn create_sysroot(build: &Build, compiler: &Compiler) {
-    // nothing to do in stage0
-    if compiler.stage == 0 {
-        return
-    }
-
     let sysroot = build.sysroot(compiler);
     let _ = fs::remove_dir_all(&sysroot);
     t!(fs::create_dir_all(&sysroot));
@@ -396,7 +391,7 @@ pub fn tool(build: &Build, stage: u32, host: &str, tool: &str) {
 /// all files in a directory and updating the stamp if any are newer.
 fn update_mtime(path: &Path) {
     let mut max = None;
-    if let Ok(entries) = path.parent().unwrap().read_dir() {
+    if let Ok(entries) = path.parent().unwrap().join("deps").read_dir() {
         for entry in entries.map(|e| t!(e)) {
             if t!(entry.file_type()).is_file() {
                 let meta = t!(entry.metadata());