diff -r c022bc48b7ed -r c4901c0e0579 common/autoconf/generated-configure.sh --- a/common/autoconf/generated-configure.sh Tue Mar 05 11:46:02 2013 -0800 +++ b/common/autoconf/generated-configure.sh Tue Mar 05 15:09:56 2013 -0800 @@ -3725,7 +3725,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1361899489 +DATE_WHEN_GENERATED=1362517596 ############################################################################### # @@ -18097,14 +18097,18 @@ ### Locate C compiler (CC) -# gcc is almost always present, but on Windows we -# prefer cl.exe and on Solaris we prefer CC. -# Thus test for them in this order. -if test "x$OPENJDK_TARGET_OS" = xmacosx; then - # Do not probe for cc on MacOSX. - COMPILER_CHECK_LIST="cl gcc" -else - COMPILER_CHECK_LIST="cl cc gcc" +# On windows, only cl.exe is supported. +# On Solaris, cc is preferred to gcc. +# Elsewhere, gcc is preferred to cc. + +if test "x$CC" != x; then + COMPILER_CHECK_LIST="$CC" +elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then + COMPILER_CHECK_LIST="cl" +elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then + COMPILER_CHECK_LIST="cc gcc" +else + COMPILER_CHECK_LIST="gcc cc" fi @@ -19068,7 +19072,7 @@ $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;} -# Now that we have resolved CC ourself, let autoconf have it's go at it +# Now that we have resolved CC ourself, let autoconf have its go at it ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -19670,12 +19674,16 @@ ### Locate C++ compiler (CXX) -if test "x$OPENJDK_TARGET_OS" = xmacosx; then - # Do not probe for CC on MacOSX. - COMPILER_CHECK_LIST="cl g++" -else - COMPILER_CHECK_LIST="cl CC g++" -fi +if test "x$CXX" != x; then + COMPILER_CHECK_LIST="$CXX" +elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then + COMPILER_CHECK_LIST="cl" +elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then + COMPILER_CHECK_LIST="CC g++" +else + COMPILER_CHECK_LIST="g++ CC" +fi + COMPILER_NAME=C++ @@ -20637,7 +20645,7 @@ $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;} -# Now that we have resolved CXX ourself, let autoconf have it's go at it +# Now that we have resolved CXX ourself, let autoconf have its go at it ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'