1*4882a593SmuzhiyunFrom ab0eec78382bd00ce533aec2c84fd50c1733033d Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com>
3*4882a593SmuzhiyunDate: Sat, 5 Jan 2013 19:42:51 -0800
4*4882a593Smuzhiyun
5*4882a593Smuzhiyun---
6*4882a593Smuzhiyun configure | 32 ++++++++++++++++++--------------
7*4882a593Smuzhiyun 1 file changed, 18 insertions(+), 14 deletions(-)
8*4882a593Smuzhiyun
9*4882a593Smuzhiyundiff --git a/configure b/configure
10*4882a593Smuzhiyunindex 76c2812..78ce2ff 100755
11*4882a593Smuzhiyun--- a/configure
12*4882a593Smuzhiyun+++ b/configure
13*4882a593Smuzhiyun@@ -535,14 +535,18 @@ else
14*4882a593Smuzhiyun 	GZIP_SUFFIX=".gz"
15*4882a593Smuzhiyun fi
16*4882a593Smuzhiyun
17*4882a593Smuzhiyun-printf "Finding suitable compiler........"
18*4882a593Smuzhiyun-CC=`pathsearch "${CC:-cc}"`
19*4882a593Smuzhiyun-if test -z "$CC" -o ! -x "$CC"; then
20*4882a593Smuzhiyun-	CC=`pathsearch "${CC:-gcc}"`
21*4882a593Smuzhiyun+if test -z "$CC"; then
22*4882a593Smuzhiyun+	printf "Finding suitable compiler........"
23*4882a593Smuzhiyun+	CC=`pathsearch "${CC:-cc}"`
24*4882a593Smuzhiyun+	if test -z "$CC" -o ! -x "$CC"; then
25*4882a593Smuzhiyun+		CC=`pathsearch "${CC:-gcc}"`
26*4882a593Smuzhiyun+	fi
27*4882a593Smuzhiyun fi
28*4882a593Smuzhiyun assert "$CC" "not found"
29*4882a593Smuzhiyun
30*4882a593Smuzhiyun-cat << EOF > .1.c
31*4882a593Smuzhiyun+if test -z "$COMPILER"; then
32*4882a593Smuzhiyun+
33*4882a593Smuzhiyun+	cat << EOF > .1.c
34*4882a593Smuzhiyun #include <stdio.h>
35*4882a593Smuzhiyun int main(void) {
36*4882a593Smuzhiyun #if defined(_WIN32)
37*4882a593Smuzhiyun@@ -569,16 +573,16 @@ int main(void) {
38*4882a593Smuzhiyun #endif
39*4882a593Smuzhiyun }
40*4882a593Smuzhiyun EOF
41*4882a593Smuzhiyun+	$CC -o .1 .1.c
42*4882a593Smuzhiyun+	COMPILER=`./.1`
43*4882a593Smuzhiyun+	r=$?
44*4882a593Smuzhiyun+	rm -f .1.c .1
45*4882a593Smuzhiyun
46*4882a593Smuzhiyun-$CC -o .1 .1.c
47*4882a593Smuzhiyun-COMPILER=`./.1`
48*4882a593Smuzhiyun-r=$?
49*4882a593Smuzhiyun-rm -f .1.c .1
50*4882a593Smuzhiyun-
51*4882a593Smuzhiyun-if test "$r" -ne 0; then
52*4882a593Smuzhiyun-	assert "" "update compiler"
53*4882a593Smuzhiyun-else
54*4882a593Smuzhiyun-	echo "success [$CC]"
55*4882a593Smuzhiyun+	if test "$r" -ne 0; then
56*4882a593Smuzhiyun+		assert "" "update compiler"
57*4882a593Smuzhiyun+	else
58*4882a593Smuzhiyun+		echo "success [$CC]"
59*4882a593Smuzhiyun+	fi
60*4882a593Smuzhiyun fi
61*4882a593Smuzhiyun
62*4882a593Smuzhiyun if test "$COMPILER" = "suncc"; then
63