diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-07-18 18:03:38 -0600 |
|---|---|---|
| committer | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-07-20 11:24:37 -0600 |
| commit | 56128fb3acdbb40876d1fc8aee613792ebef3080 (patch) | |
| tree | c8753059843a319610a541faa01b990a0aac6e0f /src/bootstrap/native.rs | |
| parent | bca1e2ffd1658e800e15e730dee5d6cc02722270 (diff) | |
| download | rust-56128fb3acdbb40876d1fc8aee613792ebef3080.tar.gz rust-56128fb3acdbb40876d1fc8aee613792ebef3080.zip | |
Implement available paths list.
Diffstat (limited to 'src/bootstrap/native.rs')
| -rw-r--r-- | src/bootstrap/native.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index b60a3760eb2..af13d866497 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -32,7 +32,7 @@ use gcc; use Build; use util; use build_helper::up_to_date; -use builder::{Builder, Step}; +use builder::{Builder, ShouldRun, Step}; use cache::Interned; // rules.build("llvm", "src/llvm") @@ -55,8 +55,8 @@ impl Step for Llvm { type Output = (); const ONLY_HOSTS: bool = true; - fn should_run(_builder: &Builder, path: &Path) -> bool { - path.ends_with("src/llvm") + fn should_run(run: ShouldRun) -> ShouldRun { + run.path("src/llvm") } /// Compile LLVM for `target`. @@ -257,8 +257,8 @@ pub struct TestHelpers { impl Step for TestHelpers { type Output = (); - fn should_run(_builder: &Builder, path: &Path) -> bool { - path.ends_with("src/rt/rust_test_helpers.c") + fn should_run(run: ShouldRun) -> ShouldRun { + run.path("src/rt/rust_test_helpers.c") } fn make_run( @@ -322,8 +322,8 @@ pub struct Openssl { impl Step for Openssl { type Output = (); - fn should_run(_builder: &Builder, _path: &Path) -> bool { - false + fn should_run(run: ShouldRun) -> ShouldRun { + run.never() } fn run(self, builder: &Builder) { |