8006988: build-infra: Configure fails if 'cl' is in path on linux
Respect user CC and CXX environment variables; use cl iff on windows Reviewed-by: erikj
This commit is contained in:
parent
20b2cd4890
commit
8391257f03
common/autoconf
@ -3733,7 +3733,7 @@ fi
|
||||
#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
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
@ -18105,14 +18105,18 @@ fi
|
||||
|
||||
### 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"
|
||||
# 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="cl cc gcc"
|
||||
COMPILER_CHECK_LIST="gcc cc"
|
||||
fi
|
||||
|
||||
|
||||
@ -19076,7 +19080,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO
|
||||
$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'
|
||||
@ -19678,13 +19682,17 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
||||
|
||||
### Locate C++ compiler (CXX)
|
||||
|
||||
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
|
||||
# Do not probe for CC on MacOSX.
|
||||
COMPILER_CHECK_LIST="cl g++"
|
||||
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="cl CC g++"
|
||||
COMPILER_CHECK_LIST="g++ CC"
|
||||
fi
|
||||
|
||||
|
||||
COMPILER_NAME=C++
|
||||
|
||||
CXX=
|
||||
@ -20645,7 +20653,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO
|
||||
$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'
|
||||
|
@ -248,30 +248,38 @@ fi
|
||||
|
||||
### 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"
|
||||
# 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="cl cc gcc"
|
||||
COMPILER_CHECK_LIST="gcc cc"
|
||||
fi
|
||||
|
||||
TOOLCHAIN_FIND_COMPILER([CC],[C],[$COMPILER_CHECK_LIST])
|
||||
# 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_PROG_CC([$CC])
|
||||
|
||||
### Locate C++ compiler (CXX)
|
||||
|
||||
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
|
||||
# Do not probe for CC on MacOSX.
|
||||
COMPILER_CHECK_LIST="cl g++"
|
||||
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="cl CC g++"
|
||||
COMPILER_CHECK_LIST="g++ CC"
|
||||
fi
|
||||
|
||||
TOOLCHAIN_FIND_COMPILER([CXX],[C++],[$COMPILER_CHECK_LIST])
|
||||
# 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_PROG_CXX([$CXX])
|
||||
|
||||
### Locate other tools
|
||||
|
Loading…
x
Reference in New Issue
Block a user