summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2020-01-27 08:42:20 +0100
committerRichard Levitte <levitte@openssl.org>2020-02-02 11:57:01 +0100
commitd2e8cbfb45e8dbd24f7bb394b0141130b4c0eb98 (patch)
tree012a297e163be833155343290befc3d63a970f73
parenta9a8863b791a54625da2a079a496a31cb7f94482 (diff)
config: ensure the perl Configure run is the last statement
Running any statement after Configure means we lose its exit code Fixes #10951 Reviewed-by: Ben Kaduk <kaduk@mit.edu> (Merged from https://github.com/openssl/openssl/pull/10953) (cherry picked from commit 4bf3e989fef9268507ba02744e7f71ee5637681c)
-rwxr-xr-xconfig13
1 files changed, 7 insertions, 6 deletions
diff --git a/config b/config
index c1a94d4e42..deb7b8f0b0 100755
--- a/config
+++ b/config
@@ -908,8 +908,12 @@ fi
OUT="$OUT"
-$PERL $THERE/Configure LIST | grep "$OUT" > /dev/null
-if [ $? = "0" ]; then
+if [ "$OUT" = "darwin64-x86_64-cc" ]; then
+ echo "WARNING! If you wish to build 32-bit libraries, then you have to"
+ echo " invoke 'KERNEL_BITS=32 $THERE/config $options'."
+fi
+
+if $PERL $THERE/Configure LIST | grep "$OUT" > /dev/null; then
if [ "$VERBOSE" = "true" ]; then
echo /usr/bin/env \
__CNF_CPPDEFINES="'$__CNF_CPPDEFINES'" \
@@ -939,8 +943,5 @@ else
exit 1
fi
-if [ "$OUT" = "darwin64-x86_64-cc" ]; then
- echo "WARNING! If you wish to build 32-bit libraries, then you have to"
- echo " invoke 'KERNEL_BITS=32 $THERE/config $options'."
-fi
+# Do not add anothing from here on, so we don't lose the Configure exit code
)