File tree Expand file tree Collapse file tree 2 files changed +20
-3
lines changed Expand file tree Collapse file tree 2 files changed +20
-3
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
5
5
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8
- refs/heads/try2: 9b9ef442337ee3b9a29449a0792ae2eeb0480d0c
8
+ refs/heads/try2: 49fe69047776651114e014a8307c684fcb866efd
9
9
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
10
10
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
11
11
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
Original file line number Diff line number Diff line change @@ -942,16 +942,33 @@ then
942
942
msg " git: submodule sync"
943
943
" ${CFG_GIT} " submodule sync
944
944
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
+
945
962
msg " git: submodule update"
946
- " ${CFG_GIT} " submodule update --init
963
+ " ${CFG_GIT} " submodule update
947
964
need_ok " git failed"
948
965
949
966
msg " git: submodule foreach sync"
950
967
" ${CFG_GIT} " submodule foreach --recursive ' if test -e .gitmodules; then git submodule sync; fi'
951
968
need_ok " git failed"
952
969
953
970
msg " git: submodule foreach update"
954
- " ${CFG_GIT} " submodule update --init -- recursive
971
+ " ${CFG_GIT} " submodule update --recursive
955
972
need_ok " git failed"
956
973
957
974
# NB: this is just for the sake of getting the submodule SHA1 values
You can’t perform that action at this time.
0 commit comments