summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorBen Laurie <ben@openssl.org>2009-01-18 13:06:37 +0100
committerBen Laurie <ben@openssl.org>2009-01-18 13:06:37 +0100
commit7f62532030e7881011eced5c561b3cd606518e61 (patch)
treeefd2eae2342b2c67dc5cd86d305b881232f79902 /config
parentUpdate certificate hash line format to handle canonical format (diff)
downloadopenssl-7f62532030e7881011eced5c561b3cd606518e61.tar.xz
openssl-7f62532030e7881011eced5c561b3cd606518e61.zip
Allow CC to be overridden.
Diffstat (limited to 'config')
-rwxr-xr-xconfig16
1 files changed, 11 insertions, 5 deletions
diff --git a/config b/config
index a84d6b4b4e..40bcd0a18a 100755
--- a/config
+++ b/config
@@ -407,11 +407,8 @@ exit 0
# this is where the translation occurs into SSLeay terms
# ---------------------------------------------------------------------------
-# figure out if gcc is available and if so we use it otherwise
-# we fallback to whatever cc does on the system
GCCVER=`(gcc -dumpversion) 2>/dev/null`
if [ "$GCCVER" != "" ]; then
- CC=gcc
# then strip off whatever prefix egcs prepends the number with...
# Hopefully, this will work for any future prefixes as well.
GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
@@ -420,8 +417,17 @@ if [ "$GCCVER" != "" ]; then
# major and minor version numbers.
# peak single digit before and after first dot, e.g. 2.95.1 gives 29
GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
-else
- CC=cc
+fi
+
+# Only set CC if not supplied already
+if [ -z "$CC" ]; then
+# figure out if gcc is available and if so we use it otherwise
+# we fallback to whatever cc does on the system
+ if [ "$GCCVER" != "" ]; then
+ CC=gcc
+ else
+ CC=cc
+ fi
fi
GCCVER=${GCCVER:-0}
if [ "$SYSTEM" = "HP-UX" ];then