From ab0eec78382bd00ce533aec2c84fd50c1733033d Mon Sep 17 00:00:00 2001
|
From: Khem Raj <raj.khem@gmail.com>
|
Date: Sat, 5 Jan 2013 19:42:51 -0800
|
|
---
|
configure | 32 ++++++++++++++++++--------------
|
1 file changed, 18 insertions(+), 14 deletions(-)
|
|
diff --git a/configure b/configure
|
index 76c2812..78ce2ff 100755
|
--- a/configure
|
+++ b/configure
|
@@ -535,14 +535,18 @@ else
|
GZIP_SUFFIX=".gz"
|
fi
|
|
-printf "Finding suitable compiler........"
|
-CC=`pathsearch "${CC:-cc}"`
|
-if test -z "$CC" -o ! -x "$CC"; then
|
- CC=`pathsearch "${CC:-gcc}"`
|
+if test -z "$CC"; then
|
+ printf "Finding suitable compiler........"
|
+ CC=`pathsearch "${CC:-cc}"`
|
+ if test -z "$CC" -o ! -x "$CC"; then
|
+ CC=`pathsearch "${CC:-gcc}"`
|
+ fi
|
fi
|
assert "$CC" "not found"
|
|
-cat << EOF > .1.c
|
+if test -z "$COMPILER"; then
|
+
|
+ cat << EOF > .1.c
|
#include <stdio.h>
|
int main(void) {
|
#if defined(_WIN32)
|
@@ -569,16 +573,16 @@ int main(void) {
|
#endif
|
}
|
EOF
|
+ $CC -o .1 .1.c
|
+ COMPILER=`./.1`
|
+ r=$?
|
+ rm -f .1.c .1
|
|
-$CC -o .1 .1.c
|
-COMPILER=`./.1`
|
-r=$?
|
-rm -f .1.c .1
|
-
|
-if test "$r" -ne 0; then
|
- assert "" "update compiler"
|
-else
|
- echo "success [$CC]"
|
+ if test "$r" -ne 0; then
|
+ assert "" "update compiler"
|
+ else
|
+ echo "success [$CC]"
|
+ fi
|
fi
|
|
if test "$COMPILER" = "suncc"; then
|
