root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Richard Levitte 2020-01-27 08:42:20 +01:00
parent 03e16083ff
commit 4bf3e989fe
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config
View File

@ -898,8 +898,12 @@ fi
OUT="$OUT" OUT="$OUT"
$PERL $THERE/Configure LIST | grep "$OUT" > /dev/null if [ "$OUT" = "darwin64-x86_64-cc" ]; then
if [ $? = "0" ]; 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 if [ "$VERBOSE" = "true" ]; then
echo /usr/bin/env \ echo /usr/bin/env \
__CNF_CPPDEFINES="'$__CNF_CPPDEFINES'" \ __CNF_CPPDEFINES="'$__CNF_CPPDEFINES'" \
@ -929,8 +933,5 @@ else
exit 1 exit 1
fi fi
if [ "$OUT" = "darwin64-x86_64-cc" ]; then # Do not add anothing from here on, so we don't lose the Configure exit code
echo "WARNING! If you wish to build 32-bit libraries, then you have to"
echo " invoke 'KERNEL_BITS=32 $THERE/config $options'."
fi
) )