]> git.lizzy.rs Git - rust.git/commitdiff
bootstrap: Avoid fetching jemalloc if it's disabled
authorTatsuyuki Ishi <ishitatsuyuki@gmail.com>
Tue, 17 Oct 2017 06:01:49 +0000 (15:01 +0900)
committerTatsuyuki Ishi <ishitatsuyuki@gmail.com>
Tue, 17 Oct 2017 06:01:49 +0000 (15:01 +0900)
Fix #45300

src/bootstrap/bootstrap.py

index 842144ff1ea00cbe24ca9b33c308ad72508d5ece..c441dc9acb85ff28dc0e28dbbfcdea71ac12af1c 100644 (file)
@@ -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)