diff options
| -rw-r--r-- | CHANGES | 5 | ||||
| -rwxr-xr-x | Configure | 4 | ||||
| -rwxr-xr-x | config | 16 |
3 files changed, 19 insertions, 6 deletions
@@ -4,7 +4,10 @@ Changes between 0.9.8j and 0.9.8k [xx XXX xxxx] - *) + *) Allow CC in the environment to override the automatically chosen + compiler. Note that nothing is done to ensure flags work with the + chosen compiler. + [Ben Laurie] Changes between 0.9.8i and 0.9.8j [07 Jan 2009] @@ -948,6 +948,10 @@ print "Configuring for $target\n"; my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1); my $cc = $fields[$idx_cc]; +# Allow environment CC to override compiler... +if($ENV{CC}) { + $cc = $ENV{CC}; +} my $cflags = $fields[$idx_cflags]; my $unistd = $fields[$idx_unistd]; my $thread_cflag = $fields[$idx_thread_cflag]; @@ -399,11 +399,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]*\-//'` @@ -412,8 +409,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 |