diff options
| author | kennytm <kennytm@gmail.com> | 2017-10-19 23:13:31 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2017-10-20 00:01:54 +0800 |
| commit | 44e882cf923d14994090c77d09df4946cc41becf (patch) | |
| tree | ea3b19b5090578271a991323fe40fd2c39b89e4c /src/bootstrap | |
| parent | 3de1f8ba539bdbc45d08bdcf1c4266149bc5d567 (diff) | |
| parent | 0dde8cdd40437f26bccfcbbf73a0dfa720702d2f (diff) | |
Rollup merge of #45375 - topecongiro:enable-tilde, r=Mark-Simulacrum
Allow passing a path with tilde to the configure script Currently `./configure --local-rust-root=~/.cargo --enable-local-rebuild` fails with ``` Exception: no cargo executable found at `~/.cargo//bin/cargo` ```
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index c441dc9acb8..0ab4c79e3b2 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -532,7 +532,7 @@ class RustBuild(object): """ config = self.get_toml(program) if config: - return config + return os.path.expanduser(config) return os.path.join(self.bin_root(), "bin", "{}{}".format( program, self.exe_suffix())) |