diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2018-02-15 18:12:04 -0700 |
|---|---|---|
| committer | Mark Simulacrum <mark.simulacrum@gmail.com> | 2018-02-15 19:12:26 -0700 |
| commit | 366a65665aed84fda50e4ea8bc905153ffcc1287 (patch) | |
| tree | 1dbfddda7ea00071f5c9234ea231e32dd335e5a5 /src/bootstrap/builder.rs | |
| parent | e78ecd2e70961e64040598a019febec44959f7dd (diff) | |
| download | rust-366a65665aed84fda50e4ea8bc905153ffcc1287.tar.gz rust-366a65665aed84fda50e4ea8bc905153ffcc1287.zip | |
Consider paths passed to x.py to be root-relative.
We'd previously assumed that these paths would be relative to the src dir, and that for example our various CI scripts would, when calling x.py, use `../x.py build ../src/tools/...` but this isn't the case -- they use `../x.py` without using the relevant source-relative path. We eventually may want to make this (actually somewhat logical) change, but this is not that time.
Diffstat (limited to 'src/bootstrap/builder.rs')
| -rw-r--r-- | src/bootstrap/builder.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 22a128e38e8..7345b284dc7 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -385,6 +385,10 @@ impl<'a> Builder<'a> { Subcommand::Clean { .. } => panic!(), }; + if paths[0] == Path::new("nonexistent/path/to/trigger/cargo/metadata") { + return; + } + let builder = Builder { build, top_stage: build.config.stage.unwrap_or(2), |