Skip to content

Commit

Permalink
don't update the src/jemalloc submodule is jemalloc has been disabled
Browse files Browse the repository at this point in the history
i.e. via the --disable-jemalloc configure flag
  • Loading branch information
Jorge Aparicio committed Aug 28, 2016
1 parent a375799 commit 5683bf9
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion src/bootstrap/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit 5683bf9

Please sign in to comment.