Skip to content

Commit 5683bf9

Browse files
author
Jorge Aparicio
committed
don't update the src/jemalloc submodule is jemalloc has been disabled
i.e. via the --disable-jemalloc configure flag
1 parent a375799 commit 5683bf9

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/bootstrap/lib.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,14 @@ impl Build {
542542
for submodule in submodules {
543543
// If using llvm-root then don't touch the llvm submodule.
544544
if submodule.path.components().any(|c| c == Component::Normal("llvm".as_ref())) &&
545-
self.config.target_config.get(&self.config.build).and_then(|c| c.llvm_config.as_ref()).is_some()
545+
self.config.target_config.get(&self.config.build)
546+
.and_then(|c| c.llvm_config.as_ref()).is_some()
547+
{
548+
continue
549+
}
550+
551+
if submodule.path.components().any(|c| c == Component::Normal("jemalloc".as_ref())) &&
552+
!self.config.use_jemalloc
546553
{
547554
continue
548555
}

0 commit comments

Comments
 (0)