blob: d3bfab7bbe2158a3a8816817b224b83832d663b2 (
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
|
Index: git/configure
===================================================================
--- git.orig/configure 2012-11-19 21:07:51.917429465 -0800
+++ git/configure 2012-11-19 21:13:19.337437278 -0800
@@ -439,14 +442,18 @@
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(__GNUC__) && (__GNUC__ >= 4)
@@ -569,16 +576,16 @@
#endif
}
EOF
-
-$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]"
+ $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]"
+ fi
fi
if test "$COMPILER" = "suncc"; then
|
