Set the 386 flag automatically when building on i386.
This commit is contained in:
parent
abb3e53f9b
commit
5d3bb220c8
27
config
27
config
@ -1,17 +1,11 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# config - this is a merge of minarch and GuessOS from the Apache Group
|
# OpenSSL config: determine the operating system and run ./Configure
|
||||||
# which then automatically runs Configure from SSLeay after
|
|
||||||
# mapping the Apache names for OSs into SSLeay names
|
|
||||||
#
|
#
|
||||||
# 29-May-97 eay Added no-asm option
|
# "config -h" for usage information.
|
||||||
# 27-May-97 eay Alpha linux mods
|
|
||||||
# ??-May-97 eay IRIX mods
|
|
||||||
# 16-Sep-97 tjh first cut of merged version
|
|
||||||
#
|
|
||||||
# Tim Hudson
|
|
||||||
# tjh@cryptsoft.com
|
|
||||||
#
|
#
|
||||||
|
# this is a merge of minarch and GuessOS from the Apache Group.
|
||||||
|
# Originally written by Tim Hudson <tjh@cryptsoft.com>.
|
||||||
|
|
||||||
# Original Apache Group comments on GuessOS
|
# Original Apache Group comments on GuessOS
|
||||||
|
|
||||||
@ -259,23 +253,20 @@ case "$i" in
|
|||||||
-d*) PREFIX="debug-";;
|
-d*) PREFIX="debug-";;
|
||||||
-v*) VERBOSE="true";;
|
-v*) VERBOSE="true";;
|
||||||
-t*) TEST="true";;
|
-t*) TEST="true";;
|
||||||
-h*) cat <<EOF
|
-h*) TEST="true"; cat <<EOF
|
||||||
usage: config [options]
|
Usage: config [options]
|
||||||
-d Add a debug- prefix to machine choice.
|
-d Add a debug- prefix to machine choice.
|
||||||
-v Verbose mode.
|
-v Verbose mode.
|
||||||
-t Test mode, do not run the Configure perl script.
|
-t Test mode, do not run the Configure perl script.
|
||||||
-h This help.
|
-h This help.
|
||||||
|
|
||||||
Any other text will be passed to the Configure perl script.
|
Any other text will be passed to the Configure perl script.
|
||||||
Usefull options include
|
Useful options include
|
||||||
no-asm Build with no assember code.
|
no-asm Build with no assember code.
|
||||||
-Dxxx Add xxx define to compilation.
|
-Dxxx Add xxx define to compilation.
|
||||||
-Lxxx Add xxx library include path to build.
|
-Lxxx Add xxx library include path to build.
|
||||||
-lxxx Add xxx library to build.
|
-lxxx Add xxx library to build.
|
||||||
|
|
||||||
eg, to build using RSAref, without assember, building to allow anon-DH
|
|
||||||
ciphers and null encryption ciphers,
|
|
||||||
config no-asm -DRSAref -DSSL_ALLOW_ADH -DSSL_ALLOW_ENULL -lrsaref
|
|
||||||
EOF
|
EOF
|
||||||
;;
|
;;
|
||||||
*) options=$options" $i" ;;
|
*) options=$options" $i" ;;
|
||||||
@ -328,6 +319,10 @@ case "$GUESSOS" in
|
|||||||
*) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
|
*) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
case "$GUESSOS" in
|
||||||
|
i386-*) options="$options 386" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
if [ -z "$OUT" ]; then
|
if [ -z "$OUT" ]; then
|
||||||
OUT="$CC"
|
OUT="$CC"
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user