File tree Expand file tree Collapse file tree 2 files changed +4
-17
lines changed Expand file tree Collapse file tree 2 files changed +4
-17
lines changed Original file line number Diff line number Diff line change 2
2
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
4
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5
- refs/heads/try: 2049d1f05e29e50ae92c2551adf24434f3c6b680
5
+ refs/heads/try: a7c4c18667913088014197a632d6d06e8ea21141
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
Original file line number Diff line number Diff line change @@ -306,10 +306,11 @@ probe_need CFG_CURL curl
306
306
# and shouldn't attempt to load submodules
307
307
if [ ! -e ${CFG_SRC_DIR} .git ]
308
308
then
309
+ probe CFG_GIT git
309
310
msg " git: no git directory. disabling submodules"
310
311
CFG_DISABLE_MANAGE_SUBMODULES=1
311
312
else
312
- probe_need CFG_GIT git
313
+ probe_need CFG_GIT git
313
314
fi
314
315
315
316
probe CFG_CLANG clang++
@@ -482,14 +483,6 @@ done
482
483
# Configure submodules
483
484
step_msg " configuring submodules"
484
485
485
- # If we have no git directory then we are probably a tarball distribution
486
- # and shouldn't attempt to load submodules
487
- if [ ! -e ${CFG_SRC_DIR} .git ]
488
- then
489
- msg " git: no git directory. disabling submodules"
490
- CFG_DISABLE_MANAGE_SUBMODULES=1
491
- fi
492
-
493
486
# Have to be in the top of src directory for this
494
487
if [ -z $CFG_DISABLE_MANAGE_SUBMODULES ]
495
488
then
@@ -679,14 +672,8 @@ putvar CFG_PREFIX
679
672
putvar CFG_TARGET_TRIPLES
680
673
putvar CFG_C_COMPILER
681
674
putvar CFG_LIBDIR
675
+ putvar CFG_DISABLE_MANAGE_SUBMODULES
682
676
683
- # Setting this again because it may have been changed
684
- if [ $CFG_DISABLE_MANAGE_SUBMODULES ]
685
- then
686
- putvar CFG_DISABLE_MANAGE_SUBMODULES
687
- fi
688
-
689
- # Ditto for pandoc
690
677
if [ ! -z $BAD_PANDOC ]
691
678
then
692
679
CFG_PANDOC=
You can’t perform that action at this time.
0 commit comments