blob: 9e5058f2ca25bb6d421efb2d28b31d755380015c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
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
|
