about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorJorge Aparicio <japaricious@gmail.com>2016-08-27 22:53:19 -0500
committerJorge Aparicio <japaricious@gmail.com>2016-08-27 22:53:19 -0500
commit5683bf9e2020506003d6528482e0673399f61c7d (patch)
tree8c06ec05ef17b686e379778390a8c7bb5a2c0ea5 /src
parenta375799f7a4793adc92b76df59dc0be0bb2a90b8 (diff)
don't update the src/jemalloc submodule is jemalloc has been disabled
i.e. via the --disable-jemalloc configure flag
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/lib.rs9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index b1a609aac5c..8d0a6a81572 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -542,7 +542,14 @@ impl Build {
         for submodule in submodules {
             // If using llvm-root then don't touch the llvm submodule.
             if submodule.path.components().any(|c| c == Component::Normal("llvm".as_ref())) &&
-                self.config.target_config.get(&self.config.build).and_then(|c| c.llvm_config.as_ref()).is_some()
+                self.config.target_config.get(&self.config.build)
+                    .and_then(|c| c.llvm_config.as_ref()).is_some()
+            {
+                continue
+            }
+
+            if submodule.path.components().any(|c| c == Component::Normal("jemalloc".as_ref())) &&
+                !self.config.use_jemalloc
             {
                 continue
             }