summary refs log tree commit diff
path: root/src/bootstrap/bootstrap.py
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2016-11-16 18:02:56 -0500
committerNiko Matsakis <niko@alum.mit.edu>2016-12-19 11:46:38 -0500
commit83453bc673ab110a70c214c6c2bce8355ca8cf1a (patch)
treef0c9c4673e5c94dbef52e998b1a2e1b3399eee1f /src/bootstrap/bootstrap.py
parentef8921add611999a624018a30af4c243d7f48ed1 (diff)
downloadrust-83453bc673ab110a70c214c6c2bce8355ca8cf1a.tar.gz
rust-83453bc673ab110a70c214c6c2bce8355ca8cf1a.zip
add and document `--incremental` flag along with misc other changes
For example:

- we now support `-vv` to get very verbose output.
- RUSTFLAGS is respected by `x.py`
- better error messages for some cases
Diffstat (limited to 'src/bootstrap/bootstrap.py')
-rw-r--r--src/bootstrap/bootstrap.py2
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: