Re: [Qemu-devel] [PATCH] Improve gcc 3 checking

[Anthony Liguori]

Paul Brook wrote:
> > If they explicitly specific an invalid --cc=, the checks will get
> > triggered (but in the past, we would have bailed).
> >     
>
> That's what I'm objecting to. If I do:
>
> ./configure --cc=gcc4
>
> I expect configure to either use gcc4 or fail with an error. Preferably the 
> latter, but I'm open to persuasion.
>
> I don't want configure to decide it knows better and use gcc3 anyway.
>   

Okay, it now will throw an error if you specify --cc=gcc4.

Regards,

Anthony Liguori

> Paul
>   

diff -r f928121a13c1 configure
--- a/configure Mon Dec 18 20:29:34 2006 -0600
+++ b/configure Mon Dec 18 21:20:36 2006 -0600
@@ -22,6 +22,8 @@ static="no"
 static="no"
 cross_prefix=""
 cc="gcc"
+gcc3_check="yes"
+gcc3_list="gcc-3.4 gcc34 gcc-3.3 gcc33 gcc-3.2 gcc32"
 host_cc="gcc"
 ar="ar"
 make="make"
@@ -178,6 +180,7 @@ for opt do
   --cross-prefix=*) cross_prefix="$optarg"
   ;;
   --cc=*) cc="$optarg"
+  gcc3_check="no"
   ;;
   --host-cc=*) host_cc="$optarg"
   ;;
@@ -311,6 +314,45 @@ if test "$mingw32" = "yes" ; then
     oss="no"
     if [ "$cpu" = "i386" ] ; then
         kqemu="yes"
+    fi
+fi
+
+# Check for gcc4, error if pre-gcc4 
+if test "$check_gcc" = "yes" ; then
+    cat > $TMPC <<EOF
+#if __GNUC__ < 4
+#error gcc3
+#endif
+int main(){return 0;}
+EOF
+    check_cc() {
+       which "$1" >&/dev/null
+       return $?
+    }
+
+    if "$cc" -o $TMPE $TMPC 2>/dev/null ; then
+       echo "WARNING: \"$cc\" looks like gcc 4.x"
+       found_compat_cc="no"
+       if test "$gcc3_check" = "yes" ; then
+           echo "Looking for gcc 3.x"
+           for compat_cc in $gcc3_list ; do
+               if check_cc "$compat_cc" ; then
+                   echo "Found \"$compat_cc\""
+                   cc="$compat_cc"
+                   found_compat_cc="yes"
+                   break
+               fi
+           done
+           if test "$found_compat_cc" = "no" ; then
+               echo "gcc 3.x not found!"
+           fi
+       fi
+       if test "$found_compat_cc" = "no" ; then
+           echo "QEMU is known to have problems when compiled with gcc 4.x"
+           echo "It is recommended that you use gcc 3.x to build QEMU"
+           echo "To use this compiler anyway, configure with 
--disable-gcc-check"
+           exit 1;
+       fi
     fi
 fi
 
@@ -414,23 +456,6 @@ have_gcc3_options="no"
 have_gcc3_options="no"
 if $cc -fno-reorder-blocks -fno-optimize-sibling-calls -o $TMPO $TMPC 2> 
/dev/null ; then
    have_gcc3_options="yes"
-fi
-
-# Check for gcc4, error if pre-gcc4 
-if test "$check_gcc" = "yes" ; then
-    cat > $TMPC <<EOF
-#if __GNUC__ < 4
-#error gcc3
-#endif
-int main(){return 0;}
-EOF
-    if $cc -o $TMPO $TMPC 2>/dev/null ; then
-        echo "ERROR: \"$cc\" looks like gcc 4.x"
-        echo "QEMU is known to have problems when compiled with gcc 4.x"
-        echo "It is recommended that you use gcc 3.x to build QEMU"
-        echo "To use this compiler anyway, configure with --disable-gcc-check"
-        exit 1;
-    fi
 fi
 
 ##########################################