Skip to content

Commit baaa3a5

Browse files
committed
---
yaml --- r: 14712 b: refs/heads/try c: a7c4c18 h: refs/heads/master v: v3
1 parent 3c5e389 commit baaa3a5

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 2049d1f05e29e50ae92c2551adf24434f3c6b680
5+
refs/heads/try: a7c4c18667913088014197a632d6d06e8ea21141
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/configure

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,11 @@ probe_need CFG_CURL curl
306306
# and shouldn't attempt to load submodules
307307
if [ ! -e ${CFG_SRC_DIR}.git ]
308308
then
309+
probe CFG_GIT git
309310
msg "git: no git directory. disabling submodules"
310311
CFG_DISABLE_MANAGE_SUBMODULES=1
311312
else
312-
probe_need CFG_GIT git
313+
probe_need CFG_GIT git
313314
fi
314315

315316
probe CFG_CLANG clang++
@@ -482,14 +483,6 @@ done
482483
# Configure submodules
483484
step_msg "configuring submodules"
484485

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-
493486
# Have to be in the top of src directory for this
494487
if [ -z $CFG_DISABLE_MANAGE_SUBMODULES ]
495488
then
@@ -679,14 +672,8 @@ putvar CFG_PREFIX
679672
putvar CFG_TARGET_TRIPLES
680673
putvar CFG_C_COMPILER
681674
putvar CFG_LIBDIR
675+
putvar CFG_DISABLE_MANAGE_SUBMODULES
682676

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
690677
if [ ! -z $BAD_PANDOC ]
691678
then
692679
CFG_PANDOC=

0 commit comments

Comments
 (0)