common/autoconf/generated-configure.sh

changeset 653
980ccff2d4f5
parent 635
907a926d3c96
parent 651
929e2461818b
child 654
22b9a31a92eb
equal deleted inserted replaced
636:cd7f2c7e2a0e 653:980ccff2d4f5
737 HOTSPOT_DIST 737 HOTSPOT_DIST
738 BUILD_OUTPUT 738 BUILD_OUTPUT
739 OVERRIDE_SRC_ROOT 739 OVERRIDE_SRC_ROOT
740 ADD_SRC_ROOT 740 ADD_SRC_ROOT
741 JDK_TOPDIR 741 JDK_TOPDIR
742 NASHORN_TOPDIR
742 HOTSPOT_TOPDIR 743 HOTSPOT_TOPDIR
743 JAXWS_TOPDIR 744 JAXWS_TOPDIR
744 JAXP_TOPDIR 745 JAXP_TOPDIR
745 CORBA_TOPDIR 746 CORBA_TOPDIR
746 LANGTOOLS_TOPDIR 747 LANGTOOLS_TOPDIR
3727 # definitions. It is replaced with custom functionality when building 3728 # definitions. It is replaced with custom functionality when building
3728 # custom sources. 3729 # custom sources.
3729 #CUSTOM_AUTOCONF_INCLUDE 3730 #CUSTOM_AUTOCONF_INCLUDE
3730 3731
3731 # Do not change or remove the following line, it is needed for consistency checks: 3732 # Do not change or remove the following line, it is needed for consistency checks:
3732 DATE_WHEN_GENERATED=1362411827 3733 DATE_WHEN_GENERATED=1362540061
3733 3734
3734 ############################################################################### 3735 ###############################################################################
3735 # 3736 #
3736 # Initialization / Boot-strapping 3737 # Initialization / Boot-strapping
3737 # 3738 #
15658 LANGTOOLS_TOPDIR="$SRC_ROOT/langtools" 15659 LANGTOOLS_TOPDIR="$SRC_ROOT/langtools"
15659 CORBA_TOPDIR="$SRC_ROOT/corba" 15660 CORBA_TOPDIR="$SRC_ROOT/corba"
15660 JAXP_TOPDIR="$SRC_ROOT/jaxp" 15661 JAXP_TOPDIR="$SRC_ROOT/jaxp"
15661 JAXWS_TOPDIR="$SRC_ROOT/jaxws" 15662 JAXWS_TOPDIR="$SRC_ROOT/jaxws"
15662 HOTSPOT_TOPDIR="$SRC_ROOT/hotspot" 15663 HOTSPOT_TOPDIR="$SRC_ROOT/hotspot"
15664 NASHORN_TOPDIR="$SRC_ROOT/nashorn"
15663 JDK_TOPDIR="$SRC_ROOT/jdk" 15665 JDK_TOPDIR="$SRC_ROOT/jdk"
15666
15664 15667
15665 15668
15666 15669
15667 15670
15668 15671
15897 fi 15900 fi
15898 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be overridden" >&5 15901 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be overridden" >&5
15899 $as_echo_n "checking if hotspot should be overridden... " >&6; } 15902 $as_echo_n "checking if hotspot should be overridden... " >&6; }
15900 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $HOTSPOT_TOPDIR" >&5 15903 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $HOTSPOT_TOPDIR" >&5
15901 $as_echo "yes with $HOTSPOT_TOPDIR" >&6; } 15904 $as_echo "yes with $HOTSPOT_TOPDIR" >&6; }
15905 fi
15906 if test "x$with_override_nashorn" != x; then
15907 CURDIR="$PWD"
15908 cd "$with_override_nashorn"
15909 NASHORN_TOPDIR="`pwd`"
15910 cd "$CURDIR"
15911 if ! test -f $NASHORN_TOPDIR/makefiles/BuildNashorn.gmk; then
15912 as_fn_error $? "You have to override nashorn with a full nashorn repo!" "$LINENO" 5
15913 fi
15914 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if nashorn should be overridden" >&5
15915 $as_echo_n "checking if nashorn should be overridden... " >&6; }
15916 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $NASHORN_TOPDIR" >&5
15917 $as_echo "yes with $NASHORN_TOPDIR" >&6; }
15902 fi 15918 fi
15903 if test "x$with_override_jdk" != x; then 15919 if test "x$with_override_jdk" != x; then
15904 CURDIR="$PWD" 15920 CURDIR="$PWD"
15905 cd "$with_override_jdk" 15921 cd "$with_override_jdk"
15906 JDK_TOPDIR="`pwd`" 15922 JDK_TOPDIR="`pwd`"
18084 fi 18100 fi
18085 18101
18086 18102
18087 ### Locate C compiler (CC) 18103 ### Locate C compiler (CC)
18088 18104
18089 # gcc is almost always present, but on Windows we 18105 # On windows, only cl.exe is supported.
18090 # prefer cl.exe and on Solaris we prefer CC. 18106 # On Solaris, cc is preferred to gcc.
18091 # Thus test for them in this order. 18107 # Elsewhere, gcc is preferred to cc.
18092 if test "x$OPENJDK_TARGET_OS" = xmacosx; then 18108
18093 # Do not probe for cc on MacOSX. 18109 if test "x$CC" != x; then
18094 COMPILER_CHECK_LIST="cl gcc" 18110 COMPILER_CHECK_LIST="$CC"
18095 else 18111 elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
18096 COMPILER_CHECK_LIST="cl cc gcc" 18112 COMPILER_CHECK_LIST="cl"
18113 elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
18114 COMPILER_CHECK_LIST="cc gcc"
18115 else
18116 COMPILER_CHECK_LIST="gcc cc"
18097 fi 18117 fi
18098 18118
18099 18119
18100 COMPILER_NAME=C 18120 COMPILER_NAME=C
18101 18121
19055 19075
19056 { $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:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5
19057 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;} 19077 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;}
19058 19078
19059 19079
19060 # Now that we have resolved CC ourself, let autoconf have it's go at it 19080 # Now that we have resolved CC ourself, let autoconf have its go at it
19061 ac_ext=c 19081 ac_ext=c
19062 ac_cpp='$CPP $CPPFLAGS' 19082 ac_cpp='$CPP $CPPFLAGS'
19063 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 19083 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
19064 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 19084 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
19065 ac_compiler_gnu=$ac_cv_c_compiler_gnu 19085 ac_compiler_gnu=$ac_cv_c_compiler_gnu
19657 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 19677 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
19658 19678
19659 19679
19660 ### Locate C++ compiler (CXX) 19680 ### Locate C++ compiler (CXX)
19661 19681
19662 if test "x$OPENJDK_TARGET_OS" = xmacosx; then 19682 if test "x$CXX" != x; then
19663 # Do not probe for CC on MacOSX. 19683 COMPILER_CHECK_LIST="$CXX"
19664 COMPILER_CHECK_LIST="cl g++" 19684 elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
19665 else 19685 COMPILER_CHECK_LIST="cl"
19666 COMPILER_CHECK_LIST="cl CC g++" 19686 elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
19667 fi 19687 COMPILER_CHECK_LIST="CC g++"
19688 else
19689 COMPILER_CHECK_LIST="g++ CC"
19690 fi
19691
19668 19692
19669 COMPILER_NAME=C++ 19693 COMPILER_NAME=C++
19670 19694
19671 CXX= 19695 CXX=
19672 # If TOOLS_DIR is set, check for all compiler names in there first 19696 # If TOOLS_DIR is set, check for all compiler names in there first
20624 20648
20625 { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5 20649 { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5
20626 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;} 20650 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;}
20627 20651
20628 20652
20629 # Now that we have resolved CXX ourself, let autoconf have it's go at it 20653 # Now that we have resolved CXX ourself, let autoconf have its go at it
20630 ac_ext=cpp 20654 ac_ext=cpp
20631 ac_cpp='$CXXCPP $CPPFLAGS' 20655 ac_cpp='$CXXCPP $CPPFLAGS'
20632 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 20656 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
20633 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 20657 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
20634 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 20658 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

mercurial