Rollup merge of rust-lang#48503 - petrochenkov:nort, r=Mark-Simulacrum

Remove directory `src/rt`
Manishearth · Feb 24, 2018 · 7ba4afc · 7ba4afc
2 parents 0a72101 + aafebbc
commit 7ba4afc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
@@ -313,7 +313,7 @@ impl Step for TestHelpers {
     type Output = ();
 
     fn should_run(run: ShouldRun) -> ShouldRun {
-        run.path("src/rt/rust_test_helpers.c")
+        run.path("src/test/auxiliary/rust_test_helpers.c")
     }
 
     fn make_run(run: RunConfig) {
@@ -326,7 +326,7 @@ impl Step for TestHelpers {
         let build = builder.build;
         let target = self.target;
         let dst = build.test_helpers_out(target);
-        let src = build.src.join("src/rt/rust_test_helpers.c");
+        let src = build.src.join("src/test/auxiliary/rust_test_helpers.c");
         if up_to_date(&src, &dst.join("librust_test_helpers.a")) {
             return
         }
@@ -353,7 +353,7 @@ impl Step for TestHelpers {
            .opt_level(0)
            .warnings(false)
            .debug(false)
-           .file(build.src.join("src/rt/rust_test_helpers.c"))
+           .file(build.src.join("src/test/auxiliary/rust_test_helpers.c"))
            .compile("rust_test_helpers");
     }
 }

diff --git a/src/rt/rust_test_helpers.c → src/test/auxiliary/rust_test_helpers.c b/src/rt/rust_test_helpers.c → src/test/auxiliary/rust_test_helpers.c