Skip to content

Commit f3bfbda

Browse files
Standardize on non-zero checks for configure
1 parent cf7e825 commit f3bfbda

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

configure

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ opt_core() {
283283
fi
284284
done
285285
else
286-
if [ ! -z "$META" ]
286+
if [ -n "$META" ]
287287
then
288288
OP="$OP=<$META>"
289289
fi
@@ -317,7 +317,7 @@ envopt() {
317317
fi
318318

319319
# If script or environment provided a value, save it.
320-
if [ ! -z "$VV" ]
320+
if [ -n "$VV" ]
321321
then
322322
putvar $V
323323
fi
@@ -767,7 +767,7 @@ probe CFG_LLDB lldb
767767
# On MacOS X, invoking `javac` pops up a dialog if the JDK is not
768768
# installed. Since `javac` is only used if `antlr4` is available,
769769
# probe for it only in this case.
770-
if [ ! -z "$CFG_ANTLR4" ]
770+
if [ -n "$CFG_ANTLR4" ]
771771
then
772772
probe CFG_JAVAC javac
773773
fi
@@ -786,14 +786,14 @@ then
786786
fi
787787
fi
788788

789-
if [ ! -z "$CFG_GDB" ]
789+
if [ -n "$CFG_GDB" ]
790790
then
791791
# Store GDB's version
792792
CFG_GDB_VERSION=$($CFG_GDB --version 2>/dev/null | head -1)
793793
putvar CFG_GDB_VERSION
794794
fi
795795

796-
if [ ! -z "$CFG_LLDB" ]
796+
if [ -n "$CFG_LLDB" ]
797797
then
798798
# Store LLDB's version
799799
CFG_LLDB_VERSION=$($CFG_LLDB --version 2>/dev/null | head -1)
@@ -819,7 +819,7 @@ step_msg "looking for target specific programs"
819819

820820
probe CFG_ADB adb
821821

822-
if [ ! -z "$CFG_PANDOC" ]
822+
if [ -n "$CFG_PANDOC" ]
823823
then
824824
# Extract "MAJOR MINOR" from Pandoc's version number
825825
PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc' |
@@ -845,7 +845,7 @@ then
845845
BIN_SUF=.exe
846846
fi
847847

848-
if [ ! -z "$CFG_ENABLE_LOCAL_RUST" ]
848+
if [ -n "$CFG_ENABLE_LOCAL_RUST" ]
849849
then
850850
system_rustc=$(which rustc)
851851
if [ -f ${CFG_LOCAL_RUST_ROOT}/bin/rustc${BIN_SUF} ]
@@ -930,18 +930,18 @@ fi
930930

931931
# Okay, at this point, we have made up our minds about whether we are
932932
# going to force CFG_ENABLE_CLANG or not; save the setting if so.
933-
if [ ! -z "$CFG_ENABLE_CLANG" ]
933+
if [ -n "$CFG_ENABLE_CLANG" ]
934934
then
935935
putvar CFG_ENABLE_CLANG
936936
fi
937937

938938
# Same with jemalloc. save the setting here.
939-
if [ ! -z "$CFG_DISABLE_JEMALLOC" ]
939+
if [ -n "$CFG_DISABLE_JEMALLOC" ]
940940
then
941941
putvar CFG_DISABLE_JEMALLOC
942942
fi
943943

944-
if [ ! -z "$CFG_LLVM_ROOT" -a -z "$CFG_DISABLE_LLVM_VERSION_CHECK" -a -e "$CFG_LLVM_ROOT/bin/llvm-config" ]
944+
if [ -n "$CFG_LLVM_ROOT" -a -z "$CFG_DISABLE_LLVM_VERSION_CHECK" -a -e "$CFG_LLVM_ROOT/bin/llvm-config" ]
945945
then
946946
step_msg "using custom LLVM at $CFG_LLVM_ROOT"
947947

@@ -970,7 +970,7 @@ fi
970970
# CFG_ENABLE_CLANG is set, that indicates that we are opting into
971971
# running such safeguards.
972972

973-
if [ ! -z "$CC" ]
973+
if [ -n "$CC" ]
974974
then
975975
msg "skipping compiler inference steps; using provided CC=$CC"
976976
CFG_CC="$CC"
@@ -983,7 +983,7 @@ then
983983
putvar CFG_USING_CLANG
984984
fi
985985
else
986-
if [ ! -z "$CFG_ENABLE_CLANG" ]
986+
if [ -n "$CFG_ENABLE_CLANG" ]
987987
then
988988
if [ -z "$CFG_CLANG" ]
989989
then
@@ -997,7 +997,7 @@ else
997997
fi
998998
fi
999999

1000-
if [ ! -z "$CFG_ENABLE_CLANG" ]
1000+
if [ -n "$CFG_ENABLE_CLANG" ]
10011001
then
10021002
case "$CC" in
10031003
(''|*clang)
@@ -1013,7 +1013,7 @@ then
10131013
CFG_CLANG_VERSION=$(echo $CFG_CLANG_REPORTED_VERSION | sed 's/.*version \(.*\) .*/\1/')
10141014
fi
10151015

1016-
if [ ! -z "$CFG_OSX_CLANG_VERSION" ]
1016+
if [ -n "$CFG_OSX_CLANG_VERSION" ]
10171017
then
10181018
case $CFG_OSX_CLANG_VERSION in
10191019
(7.0*)
@@ -1042,7 +1042,7 @@ then
10421042
esac
10431043
fi
10441044

1045-
if [ ! -z "$CFG_ENABLE_CCACHE" ]
1045+
if [ -n "$CFG_ENABLE_CCACHE" ]
10461046
then
10471047
if [ -z "$CFG_CCACHE" ]
10481048
then
@@ -1199,7 +1199,7 @@ do
11991199
;;
12001200
esac
12011201
bindir="${CFG_MSVC_ROOT}/VC/bin"
1202-
if [ ! -z "$msvc_part" ]; then
1202+
if [ -n "$msvc_part" ]; then
12031203
bindir="$bindir/$msvc_part"
12041204
fi
12051205
eval CFG_MSVC_BINDIR_$bits="\"$bindir\""
@@ -1229,7 +1229,7 @@ do
12291229
esac
12301230
done
12311231

1232-
if [ ! -z "$CFG_PERF" ]
1232+
if [ -n "$CFG_PERF" ]
12331233
then
12341234
HAVE_PERF_LOGFD=`$CFG_PERF stat --log-fd 2>&1 | grep 'unknown option'`
12351235
if [ -z "$HAVE_PERF_LOGFD" ];
@@ -1339,11 +1339,11 @@ then
13391339
"${CFG_GIT}" submodule init
13401340

13411341
# Disable submodules that we're not using
1342-
if [ ! -z "${CFG_LLVM_ROOT}" ]; then
1342+
if [ -n "${CFG_LLVM_ROOT}" ]; then
13431343
msg "git: submodule deinit src/llvm"
13441344
"${CFG_GIT}" submodule deinit src/llvm
13451345
fi
1346-
if [ ! -z "${CFG_JEMALLOC_ROOT}" ]; then
1346+
if [ -n "${CFG_JEMALLOC_ROOT}" ]; then
13471347
msg "git: submodule deinit src/jemalloc"
13481348
"${CFG_GIT}" submodule deinit src/jemalloc
13491349
fi
@@ -1390,7 +1390,7 @@ do
13901390
if [ -z $CFG_LLVM_ROOT ]
13911391
then
13921392
LLVM_BUILD_DIR=${CFG_BUILD_DIR}$t/llvm
1393-
if [ ! -z "$CFG_DISABLE_OPTIMIZE_LLVM" ]
1393+
if [ -n "$CFG_DISABLE_OPTIMIZE_LLVM" ]
13941394
then
13951395
LLVM_DBG_OPTS="--enable-debug-symbols --disable-optimized"
13961396
# Just use LLVM straight from its build directory to
@@ -1446,7 +1446,7 @@ do
14461446
msg "configuring LLVM for $t with cmake"
14471447

14481448
CMAKE_ARGS="-DLLVM_INCLUDE_TESTS=OFF"
1449-
if [ ! -z "$CFG_DISABLE_OPTIMIZE_LLVM" ]; then
1449+
if [ -n "$CFG_DISABLE_OPTIMIZE_LLVM" ]; then
14501450
CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_BUILD_TYPE=Debug"
14511451
else
14521452
CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release"
@@ -1538,7 +1538,7 @@ do
15381538

15391539
(*)
15401540
msg "inferring LLVM_CXX/CC from CXX/CC = $CXX/$CC"
1541-
if [ ! -z "$CFG_ENABLE_CCACHE" ]
1541+
if [ -n "$CFG_ENABLE_CCACHE" ]
15421542
then
15431543
if [ -z "$CFG_CCACHE" ]
15441544
then
@@ -1672,20 +1672,20 @@ putvar CFG_MANDIR
16721672

16731673
# Avoid spurious warnings from clang by feeding it original source on
16741674
# ccache-miss rather than preprocessed input.
1675-
if [ ! -z "$CFG_ENABLE_CCACHE" ] && [ ! -z "$CFG_USING_CLANG" ]
1675+
if [ -n "$CFG_ENABLE_CCACHE" ] && [ -n "$CFG_USING_CLANG" ]
16761676
then
16771677
CFG_CCACHE_CPP2=1
16781678
putvar CFG_CCACHE_CPP2
16791679
fi
16801680

1681-
if [ ! -z "$CFG_ENABLE_CCACHE" ]
1681+
if [ -n "$CFG_ENABLE_CCACHE" ]
16821682
then
16831683
CFG_CCACHE_BASEDIR=${CFG_SRC_DIR}
16841684
putvar CFG_CCACHE_BASEDIR
16851685
fi
16861686

16871687

1688-
if [ ! -z $BAD_PANDOC ]
1688+
if [ -n $BAD_PANDOC ]
16891689
then
16901690
CFG_PANDOC=
16911691
putvar CFG_PANDOC

0 commit comments

Comments
 (0)