common/autoconf/generated-configure.sh

changeset 648
a9c8a32d09f9
parent 647
cb0ac8979caa
child 650
c4901c0e0579
equal deleted inserted replaced
647:cb0ac8979caa 648:a9c8a32d09f9
3731 # definitions. It is replaced with custom functionality when building 3731 # definitions. It is replaced with custom functionality when building
3732 # custom sources. 3732 # custom sources.
3733 #CUSTOM_AUTOCONF_INCLUDE 3733 #CUSTOM_AUTOCONF_INCLUDE
3734 3734
3735 # Do not change or remove the following line, it is needed for consistency checks: 3735 # Do not change or remove the following line, it is needed for consistency checks:
3736 DATE_WHEN_GENERATED=1361899489 3736 DATE_WHEN_GENERATED=1362517596
3737 3737
3738 ############################################################################### 3738 ###############################################################################
3739 # 3739 #
3740 # Initialization / Boot-strapping 3740 # Initialization / Boot-strapping
3741 # 3741 #
18103 fi 18103 fi
18104 18104
18105 18105
18106 ### Locate C compiler (CC) 18106 ### Locate C compiler (CC)
18107 18107
18108 # gcc is almost always present, but on Windows we 18108 # On windows, only cl.exe is supported.
18109 # prefer cl.exe and on Solaris we prefer CC. 18109 # On Solaris, cc is preferred to gcc.
18110 # Thus test for them in this order. 18110 # Elsewhere, gcc is preferred to cc.
18111 if test "x$OPENJDK_TARGET_OS" = xmacosx; then 18111
18112 # Do not probe for cc on MacOSX. 18112 if test "x$CC" != x; then
18113 COMPILER_CHECK_LIST="cl gcc" 18113 COMPILER_CHECK_LIST="$CC"
18114 else 18114 elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
18115 COMPILER_CHECK_LIST="cl cc gcc" 18115 COMPILER_CHECK_LIST="cl"
18116 elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
18117 COMPILER_CHECK_LIST="cc gcc"
18118 else
18119 COMPILER_CHECK_LIST="gcc cc"
18116 fi 18120 fi
18117 18121
18118 18122
18119 COMPILER_NAME=C 18123 COMPILER_NAME=C
18120 18124
19074 19078
19075 { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5 19079 { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5
19076 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;} 19080 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;}
19077 19081
19078 19082
19079 # Now that we have resolved CC ourself, let autoconf have it's go at it 19083 # Now that we have resolved CC ourself, let autoconf have its go at it
19080 ac_ext=c 19084 ac_ext=c
19081 ac_cpp='$CPP $CPPFLAGS' 19085 ac_cpp='$CPP $CPPFLAGS'
19082 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 19086 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
19083 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 19087 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
19084 ac_compiler_gnu=$ac_cv_c_compiler_gnu 19088 ac_compiler_gnu=$ac_cv_c_compiler_gnu
19676 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 19680 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
19677 19681
19678 19682
19679 ### Locate C++ compiler (CXX) 19683 ### Locate C++ compiler (CXX)
19680 19684
19681 if test "x$OPENJDK_TARGET_OS" = xmacosx; then 19685 if test "x$CXX" != x; then
19682 # Do not probe for CC on MacOSX. 19686 COMPILER_CHECK_LIST="$CXX"
19683 COMPILER_CHECK_LIST="cl g++" 19687 elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
19684 else 19688 COMPILER_CHECK_LIST="cl"
19685 COMPILER_CHECK_LIST="cl CC g++" 19689 elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
19686 fi 19690 COMPILER_CHECK_LIST="CC g++"
19691 else
19692 COMPILER_CHECK_LIST="g++ CC"
19693 fi
19694
19687 19695
19688 COMPILER_NAME=C++ 19696 COMPILER_NAME=C++
19689 19697
19690 CXX= 19698 CXX=
19691 # If TOOLS_DIR is set, check for all compiler names in there first 19699 # If TOOLS_DIR is set, check for all compiler names in there first
20643 20651
20644 { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5 20652 { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5
20645 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;} 20653 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;}
20646 20654
20647 20655
20648 # Now that we have resolved CXX ourself, let autoconf have it's go at it 20656 # Now that we have resolved CXX ourself, let autoconf have its go at it
20649 ac_ext=cpp 20657 ac_ext=cpp
20650 ac_cpp='$CXXCPP $CPPFLAGS' 20658 ac_cpp='$CXXCPP $CPPFLAGS'
20651 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 20659 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
20652 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 20660 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
20653 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 20661 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

mercurial