| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | Index: git/configure |
| 2 | =================================================================== |
| 3 | --- git.orig/configure 2012-11-19 21:07:51.917429465 -0800 |
| 4 | +++ git/configure 2012-11-19 21:13:19.337437278 -0800 |
| 5 | @@ -439,14 +442,18 @@ |
| 6 | GZIP_SUFFIX=".gz" |
| 7 | fi |
| 8 | |
| 9 | -printf "Finding suitable compiler........" |
| 10 | -CC=`pathsearch "${CC:-cc}"` |
| 11 | -if test -z "$CC" -o ! -x "$CC"; then |
| 12 | - CC=`pathsearch "${CC:-gcc}"` |
| 13 | +if test -z "$CC"; then |
| 14 | + printf "Finding suitable compiler........" |
| 15 | + CC=`pathsearch "${CC:-cc}"` |
| 16 | + if test -z "$CC" -o ! -x "$CC"; then |
| 17 | + CC=`pathsearch "${CC:-gcc}"` |
| 18 | + fi |
| 19 | fi |
| 20 | assert "$CC" "not found" |
| 21 | |
| 22 | -cat << EOF > .1.c |
| 23 | +if test -z "$COMPILER"; then |
| 24 | + |
| 25 | + cat << EOF > .1.c |
| 26 | #include <stdio.h> |
| 27 | int main(void) { |
| 28 | #if defined(__GNUC__) && (__GNUC__ >= 4) |
| 29 | @@ -569,16 +576,16 @@ |
| 30 | #endif |
| 31 | } |
| 32 | EOF |
| 33 | - |
| 34 | -$CC -o .1 .1.c |
| 35 | -COMPILER=`./.1` |
| 36 | -r=$? |
| 37 | -rm -f .1.c .1 |
| 38 | - |
| 39 | -if test "$r" -ne 0; then |
| 40 | - assert "" "update compiler" |
| 41 | -else |
| 42 | - echo "success [$CC]" |
| 43 | + $CC -o .1 .1.c |
| 44 | + COMPILER=`./.1` |
| 45 | + r=$? |
| 46 | + rm -f .1.c .1 |
| 47 | + |
| 48 | + if test "$r" -ne 0; then |
| 49 | + assert "" "update compiler" |
| 50 | + else |
| 51 | + echo "success [$CC]" |
| 52 | + fi |
| 53 | fi |
| 54 | |
| 55 | if test "$COMPILER" = "suncc"; then |