don't update the src/jemalloc submodule is jemalloc has been disabled

i.e. via the --disable-jemalloc configure flag
rust-lang · Aug 28, 2016 · 5683bf9 · 5683bf9
1 parent a375799
commit 5683bf9
Showing 1 changed file with 8 additions and 1 deletion.
diff --git 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
             }