Skip to content

Commit 3355e46

Browse files
committed
---
yaml --- r: 116702 b: refs/heads/snap-stage3 c: 49fe690 h: refs/heads/master v: v3
1 parent 5d6163a commit 3355e46

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: bee4e6adac17f87b1cdc26ab69f8c0f5d82575a3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 9b9ef442337ee3b9a29449a0792ae2eeb0480d0c
4+
refs/heads/snap-stage3: 49fe69047776651114e014a8307c684fcb866efd
55
refs/heads/try: 009d898a9422ac04c1aa60c0e9aff3abc5fa4672
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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)