diff options
| author | Tatsuyuki Ishi <ishitatsuyuki@gmail.com> | 2017-10-17 15:01:49 +0900 |
|---|---|---|
| committer | Tatsuyuki Ishi <ishitatsuyuki@gmail.com> | 2017-10-17 15:01:49 +0900 |
| commit | cbe41168e07852d976e6aa334de7b2ef0eab6c95 (patch) | |
| tree | f149e455ffeb424c39c704cb5759bd043c464e01 | |
| parent | 90691c8c1f8b4ece2a4f831a130ae087056b0083 (diff) | |
| download | rust-cbe41168e07852d976e6aa334de7b2ef0eab6c95.tar.gz rust-cbe41168e07852d976e6aa334de7b2ef0eab6c95.zip | |
bootstrap: Avoid fetching jemalloc if it's disabled
Fix #45300
| -rw-r--r-- | src/bootstrap/bootstrap.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 842144ff1ea..c441dc9acb8 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -648,7 +648,8 @@ class RustBuild(object): if not ((module.endswith("llvm") and self.get_toml('llvm-config')) or (module.endswith("jemalloc") and - self.get_toml('jemalloc')))] + (self.get_toml('use-jemalloc') == "false" or + self.get_toml('jemalloc'))))] run(["git", "submodule", "update", "--init", "--recursive"] + submodules, cwd=self.rust_root, verbose=self.verbose) |