Add core crates to the should_run functions

est31 · est31 · commit 57ca376d33a5 · 2018-06-11T01:06:58.000+02:00
Removal of them as direct dependencies of the std crate
makes this neccessary.
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
@@ -29,6 +29,10 @@ impl Step for Std {
 
     fn should_run(run: ShouldRun) -> ShouldRun {
         run.all_krates("std")
+            .path("src/libcore")
+            .path("src/liballoc")
+            .path("src/libstd_unicode")
+            .path("src/rustc/compiler_builtins_shim")
     }
 
     fn make_run(run: RunConfig) {
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
@@ -50,6 +50,10 @@ impl Step for Std {
 
     fn should_run(run: ShouldRun) -> ShouldRun {
         run.all_krates("std")
+            .path("src/libcore")
+            .path("src/liballoc")
+            .path("src/libstd_unicode")
+            .path("src/rustc/compiler_builtins_shim")
     }
 
     fn make_run(run: RunConfig) {
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
@@ -434,7 +434,12 @@ impl Step for Std {
 
     fn should_run(run: ShouldRun) -> ShouldRun {
         let builder = run.builder;
-        run.all_krates("std").default_condition(builder.config.docs)
+        run.all_krates("std")
+            .path("src/libcore")
+            .path("src/liballoc")
+            .path("src/libstd_unicode")
+            .path("src/rustc/compiler_builtins_shim")
+            .default_condition(builder.config.docs)
     }
 
     fn make_run(run: RunConfig) {
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
@@ -1526,7 +1526,10 @@ impl Step for Crate {
                 run = run.path(krate.local_path(&builder).to_str().unwrap());
             }
         }
-        run
+        run.path("src/libcore")
+            .path("src/liballoc")
+            .path("src/libstd_unicode")
+            .path("src/rustc/compiler_builtins_shim")
     }
 
     fn make_run(run: RunConfig) {

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,10 @@ impl Step for Std {`
`29`	`29`
`30`	`30`	`fn should_run(run: ShouldRun) -> ShouldRun {`
`31`	`31`	`run.all_krates("std")`
	`32`	`+ .path("src/libcore")`
	`33`	`+ .path("src/liballoc")`
	`34`	`+ .path("src/libstd_unicode")`
	`35`	`+ .path("src/rustc/compiler_builtins_shim")`
`32`	`36`	`}`
`33`	`37`
`34`	`38`	`fn make_run(run: RunConfig) {`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,10 @@ impl Step for Std {`
`50`	`50`
`51`	`51`	`fn should_run(run: ShouldRun) -> ShouldRun {`
`52`	`52`	`run.all_krates("std")`
	`53`	`+ .path("src/libcore")`
	`54`	`+ .path("src/liballoc")`
	`55`	`+ .path("src/libstd_unicode")`
	`56`	`+ .path("src/rustc/compiler_builtins_shim")`
`53`	`57`	`}`
`54`	`58`
`55`	`59`	`fn make_run(run: RunConfig) {`
Original file line number	Diff line number	Diff line change
`@@ -1526,7 +1526,10 @@ impl Step for Crate {`
`1526`	`1526`	`run = run.path(krate.local_path(&builder).to_str().unwrap());`
`1527`	`1527`	`}`
`1528`	`1528`	`}`
`1529`		`- run`
	`1529`	`+ run.path("src/libcore")`
	`1530`	`+ .path("src/liballoc")`
	`1531`	`+ .path("src/libstd_unicode")`
	`1532`	`+ .path("src/rustc/compiler_builtins_shim")`
`1530`	`1533`	`}`
`1531`	`1534`
`1532`	`1535`	`fn make_run(run: RunConfig) {`