diff options
| author | bors <bors@rust-lang.org> | 2016-12-19 20:07:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-12-19 20:07:49 +0000 |
| commit | 94ae2a2e6791e0c4ab6fba836b2b09a07f2d3c8a (patch) | |
| tree | c4b755d9da0899f8363c8e49d59d7b7755b69a51 /src/bootstrap/bootstrap.py | |
| parent | 3f9823d5f53230e83b707b4876b5bb271a4c22ef (diff) | |
| parent | 83453bc673ab110a70c214c6c2bce8355ca8cf1a (diff) | |
| download | rust-94ae2a2e6791e0c4ab6fba836b2b09a07f2d3c8a.tar.gz rust-94ae2a2e6791e0c4ab6fba836b2b09a07f2d3c8a.zip | |
Auto merge of #38072 - nikomatsakis:bootstrap-incremental, r=acrichto
add preliminary support for incremental compilation to rustbuild.py This implements the integration described in #37929. It requires the use of a local nightly as your bootstrap compiler. The setup is described in `src/bootstrap/README.md`. This does NOT implement the "copy stage0 libs to stage1" optimization described in #37929, just because that seems orthogonal to me. In local testing, I do not yet see any incremental re-use when building rustc. I'm not sure why that is, more investigation needed. (For these reasons, this is not marked as fixing the relevant issue.) r? @alexcrichton -- I included one random cleanup (`Step::noop()`) that turned out to not be especially relevant. Feel free to tell me you liked it better the old way.
Diffstat (limited to 'src/bootstrap/bootstrap.py')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 0dda7f12007..5f16542ed2f 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -294,6 +294,8 @@ class RustBuild(object): env["DYLD_LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") env["PATH"] = os.path.join(self.bin_root(), "bin") + \ os.pathsep + env["PATH"] + if not os.path.isfile(self.cargo()): + raise Exception("no cargo executable found at `%s`" % self.cargo()) args = [self.cargo(), "build", "--manifest-path", os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")] if self.use_vendored_sources: |