Skip to content

Commit 49fe690

Browse files
committed
configure: Don't sync unused submodules
If the compiler is built with --{llvm,jemalloc,libuv}-root, then the configure script can skip updating these submodules. Closes #14822
1 parent 9b9ef44 commit 49fe690

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

configure

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -942,16 +942,33 @@ then
942942
msg "git: submodule sync"
943943
"${CFG_GIT}" submodule sync
944944

945+
msg "git: submodule init"
946+
"${CFG_GIT}" submodule init
947+
948+
# Disable submodules that we're not using
949+
if [ ! -z "${CFG_LLVM_ROOT}" ]; then
950+
msg "git: submodule deinit src/llvm"
951+
"${CFG_GIT}" submodule deinit src/llvm
952+
fi
953+
if [ ! -z "${CFG_JEMALLOC_ROOT}" ]; then
954+
msg "git: submodule deinit src/jemalloc"
955+
"${CFG_GIT}" submodule deinit src/jemalloc
956+
fi
957+
if [ ! -z "${CFG_LIBUV_ROOT}" ]; then
958+
msg "git: submodule deinit src/libuv"
959+
"${CFG_GIT}" submodule deinit src/libuv
960+
fi
961+
945962
msg "git: submodule update"
946-
"${CFG_GIT}" submodule update --init
963+
"${CFG_GIT}" submodule update
947964
need_ok "git failed"
948965

949966
msg "git: submodule foreach sync"
950967
"${CFG_GIT}" submodule foreach --recursive 'if test -e .gitmodules; then git submodule sync; fi'
951968
need_ok "git failed"
952969

953970
msg "git: submodule foreach update"
954-
"${CFG_GIT}" submodule update --init --recursive
971+
"${CFG_GIT}" submodule update --recursive
955972
need_ok "git failed"
956973

957974
# NB: this is just for the sake of getting the submodule SHA1 values

0 commit comments

Comments
 (0)