Skip to content

Commit a68622c

Browse files
committed
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.
2 parents 4682271 + 3ab778b commit a68622c

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

src/bootstrap/compile.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -258,11 +258,6 @@ fn compiler_file(compiler: &Path, file: &str) -> PathBuf {
258258
}
259259

260260
pub fn create_sysroot(build: &Build, compiler: &Compiler) {
261-
// nothing to do in stage0
262-
if compiler.stage == 0 {
263-
return
264-
}
265-
266261
let sysroot = build.sysroot(compiler);
267262
let _ = fs::remove_dir_all(&sysroot);
268263
t!(fs::create_dir_all(&sysroot));
@@ -396,7 +391,7 @@ pub fn tool(build: &Build, stage: u32, host: &str, tool: &str) {
396391
/// all files in a directory and updating the stamp if any are newer.
397392
fn update_mtime(path: &Path) {
398393
let mut max = None;
399-
if let Ok(entries) = path.parent().unwrap().read_dir() {
394+
if let Ok(entries) = path.parent().unwrap().join("deps").read_dir() {
400395
for entry in entries.map(|e| t!(e)) {
401396
if t!(entry.file_type()).is_file() {
402397
let meta = t!(entry.metadata());

0 commit comments

Comments
 (0)