diff options
| author | Jeremy Soller <jackpot51@gmail.com> | 2016-11-19 20:31:42 -0700 |
|---|---|---|
| committer | Jeremy Soller <jackpot51@gmail.com> | 2016-11-19 20:31:42 -0700 |
| commit | ae2029fc62d744e252a5a077ce0dfbf2d1683d25 (patch) | |
| tree | 8b7a0aebcf10870fd331c8d76dc00f19091b2713 /src/bootstrap/bootstrap.py | |
| parent | 2556400a5d4c9b56084332c29b6c91ac5cd3a9fa (diff) | |
| parent | 0bd2ce62b27e2b9a7dfe92fc23d9098854008089 (diff) | |
| download | rust-ae2029fc62d744e252a5a077ce0dfbf2d1683d25.tar.gz rust-ae2029fc62d744e252a5a077ce0dfbf2d1683d25.zip | |
Merge branch 'master' into redox
Diffstat (limited to 'src/bootstrap/bootstrap.py')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 08a8ca5a631..a3fabbb3e80 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -226,13 +226,16 @@ class RustBuild(object): config = self.get_toml('cargo') if config: return config + config = self.get_mk('CFG_LOCAL_RUST_ROOT') + if config: + return config + '/bin/cargo' + self.exe_suffix() return os.path.join(self.bin_root(), "bin/cargo" + self.exe_suffix()) def rustc(self): config = self.get_toml('rustc') if config: return config - config = self.get_mk('CFG_LOCAL_RUST') + config = self.get_mk('CFG_LOCAL_RUST_ROOT') if config: return config + '/bin/rustc' + self.exe_suffix() return os.path.join(self.bin_root(), "bin/rustc" + self.exe_suffix()) |