diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-01-27 08:42:20 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-02-02 11:54:46 +0100 |
| commit | 4bf3e989fef9268507ba02744e7f71ee5637681c (patch) | |
| tree | a39e9b3cdf9bbea32c4e45e92b609fc7a8db5511 /config | |
| parent | Fix "ts" no-XXX options, document two TLS options (diff) | |
| download | openssl-4bf3e989fef9268507ba02744e7f71ee5637681c.tar.xz openssl-4bf3e989fef9268507ba02744e7f71ee5637681c.zip | |
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)
Diffstat (limited to 'config')
| -rwxr-xr-x | config | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -898,8 +898,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'" \ @@ -929,8 +933,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 ) |