Add core crates to the should_run functions

Removal of them as direct dependencies of the std crate makes this neccessary.
rust-lang · Jun 10, 2018 · 57ca376 · 57ca376
1 parent 046a95d
commit 57ca376
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
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) {