Mercurial > jdk8-mips64-public / file comparison
comparison: common/autoconf/generated-configure.sh
common/autoconf/generated-configure.sh
- changeset 654
- 22b9a31a92eb
- parent 639
- 145dbc56f931
- parent 653
- 980ccff2d4f5
- child 656
- e2057191f6da
- child 888
- fe5a388bf8fe
equal
deleted
inserted
replaced
| 639:145dbc56f931 | 654:22b9a31a92eb |
|---|---|
| 747 HOTSPOT_DIST | 747 HOTSPOT_DIST |
| 748 BUILD_OUTPUT | 748 BUILD_OUTPUT |
| 749 OVERRIDE_SRC_ROOT | 749 OVERRIDE_SRC_ROOT |
| 750 ADD_SRC_ROOT | 750 ADD_SRC_ROOT |
| 751 JDK_TOPDIR | 751 JDK_TOPDIR |
| 752 NASHORN_TOPDIR | |
| 752 HOTSPOT_TOPDIR | 753 HOTSPOT_TOPDIR |
| 753 JAXWS_TOPDIR | 754 JAXWS_TOPDIR |
| 754 JAXP_TOPDIR | 755 JAXP_TOPDIR |
| 755 CORBA_TOPDIR | 756 CORBA_TOPDIR |
| 756 LANGTOOLS_TOPDIR | 757 LANGTOOLS_TOPDIR |
| 15680 LANGTOOLS_TOPDIR="$SRC_ROOT/langtools" | 15681 LANGTOOLS_TOPDIR="$SRC_ROOT/langtools" |
| 15681 CORBA_TOPDIR="$SRC_ROOT/corba" | 15682 CORBA_TOPDIR="$SRC_ROOT/corba" |
| 15682 JAXP_TOPDIR="$SRC_ROOT/jaxp" | 15683 JAXP_TOPDIR="$SRC_ROOT/jaxp" |
| 15683 JAXWS_TOPDIR="$SRC_ROOT/jaxws" | 15684 JAXWS_TOPDIR="$SRC_ROOT/jaxws" |
| 15684 HOTSPOT_TOPDIR="$SRC_ROOT/hotspot" | 15685 HOTSPOT_TOPDIR="$SRC_ROOT/hotspot" |
| 15686 NASHORN_TOPDIR="$SRC_ROOT/nashorn" | |
| 15685 JDK_TOPDIR="$SRC_ROOT/jdk" | 15687 JDK_TOPDIR="$SRC_ROOT/jdk" |
| 15688 | |
| 15686 | 15689 |
| 15687 | 15690 |
| 15688 | 15691 |
| 15689 | 15692 |
| 15690 | 15693 |
| 15919 fi | 15922 fi |
| 15920 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be overridden" >&5 | 15923 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be overridden" >&5 |
| 15921 $as_echo_n "checking if hotspot should be overridden... " >&6; } | 15924 $as_echo_n "checking if hotspot should be overridden... " >&6; } |
| 15922 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $HOTSPOT_TOPDIR" >&5 | 15925 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $HOTSPOT_TOPDIR" >&5 |
| 15923 $as_echo "yes with $HOTSPOT_TOPDIR" >&6; } | 15926 $as_echo "yes with $HOTSPOT_TOPDIR" >&6; } |
| 15927 fi | |
| 15928 if test "x$with_override_nashorn" != x; then | |
| 15929 CURDIR="$PWD" | |
| 15930 cd "$with_override_nashorn" | |
| 15931 NASHORN_TOPDIR="`pwd`" | |
| 15932 cd "$CURDIR" | |
| 15933 if ! test -f $NASHORN_TOPDIR/makefiles/BuildNashorn.gmk; then | |
| 15934 as_fn_error $? "You have to override nashorn with a full nashorn repo!" "$LINENO" 5 | |
| 15935 fi | |
| 15936 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if nashorn should be overridden" >&5 | |
| 15937 $as_echo_n "checking if nashorn should be overridden... " >&6; } | |
| 15938 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $NASHORN_TOPDIR" >&5 | |
| 15939 $as_echo "yes with $NASHORN_TOPDIR" >&6; } | |
| 15924 fi | 15940 fi |
| 15925 if test "x$with_override_jdk" != x; then | 15941 if test "x$with_override_jdk" != x; then |
| 15926 CURDIR="$PWD" | 15942 CURDIR="$PWD" |
| 15927 cd "$with_override_jdk" | 15943 cd "$with_override_jdk" |
| 15928 JDK_TOPDIR="`pwd`" | 15944 JDK_TOPDIR="`pwd`" |
| 18532 fi | 18548 fi |
| 18533 | 18549 |
| 18534 | 18550 |
| 18535 ### Locate C compiler (CC) | 18551 ### Locate C compiler (CC) |
| 18536 | 18552 |
| 18537 # gcc is almost always present, but on Windows we | 18553 # On windows, only cl.exe is supported. |
| 18538 # prefer cl.exe and on Solaris we prefer CC. | 18554 # On Solaris, cc is preferred to gcc. |
| 18539 # Thus test for them in this order. | 18555 # Elsewhere, gcc is preferred to cc. |
| 18540 if test "x$OPENJDK_TARGET_OS" = xmacosx; then | 18556 |
| 18541 # Do not probe for cc on MacOSX. | 18557 if test "x$CC" != x; then |
| 18542 COMPILER_CHECK_LIST="cl gcc" | 18558 COMPILER_CHECK_LIST="$CC" |
| 18543 else | 18559 elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
| 18544 COMPILER_CHECK_LIST="cl cc gcc" | 18560 COMPILER_CHECK_LIST="cl" |
| 18561 elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then | |
| 18562 COMPILER_CHECK_LIST="cc gcc" | |
| 18563 else | |
| 18564 COMPILER_CHECK_LIST="gcc cc" | |
| 18545 fi | 18565 fi |
| 18546 | 18566 |
| 18547 | 18567 |
| 18548 COMPILER_NAME=C | 18568 COMPILER_NAME=C |
| 18549 | 18569 |
| 19503 | 19523 |
| 19504 { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5 | 19524 { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5 |
| 19505 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;} | 19525 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;} |
| 19506 | 19526 |
| 19507 | 19527 |
| 19508 # Now that we have resolved CC ourself, let autoconf have it's go at it | 19528 # Now that we have resolved CC ourself, let autoconf have its go at it |
| 19509 ac_ext=c | 19529 ac_ext=c |
| 19510 ac_cpp='$CPP $CPPFLAGS' | 19530 ac_cpp='$CPP $CPPFLAGS' |
| 19511 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 19531 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| 19512 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | 19532 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
| 19513 ac_compiler_gnu=$ac_cv_c_compiler_gnu | 19533 ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| 20105 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | 20125 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
| 20106 | 20126 |
| 20107 | 20127 |
| 20108 ### Locate C++ compiler (CXX) | 20128 ### Locate C++ compiler (CXX) |
| 20109 | 20129 |
| 20110 if test "x$OPENJDK_TARGET_OS" = xmacosx; then | 20130 if test "x$CXX" != x; then |
| 20111 # Do not probe for CC on MacOSX. | 20131 COMPILER_CHECK_LIST="$CXX" |
| 20112 COMPILER_CHECK_LIST="cl g++" | 20132 elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
| 20113 else | 20133 COMPILER_CHECK_LIST="cl" |
| 20114 COMPILER_CHECK_LIST="cl CC g++" | 20134 elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then |
| 20115 fi | 20135 COMPILER_CHECK_LIST="CC g++" |
| 20136 else | |
| 20137 COMPILER_CHECK_LIST="g++ CC" | |
| 20138 fi | |
| 20139 | |
| 20116 | 20140 |
| 20117 COMPILER_NAME=C++ | 20141 COMPILER_NAME=C++ |
| 20118 | 20142 |
| 20119 CXX= | 20143 CXX= |
| 20120 # If TOOLS_DIR is set, check for all compiler names in there first | 20144 # If TOOLS_DIR is set, check for all compiler names in there first |
| 21072 | 21096 |
| 21073 { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5 | 21097 { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5 |
| 21074 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;} | 21098 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;} |
| 21075 | 21099 |
| 21076 | 21100 |
| 21077 # Now that we have resolved CXX ourself, let autoconf have it's go at it | 21101 # Now that we have resolved CXX ourself, let autoconf have its go at it |
| 21078 ac_ext=cpp | 21102 ac_ext=cpp |
| 21079 ac_cpp='$CXXCPP $CPPFLAGS' | 21103 ac_cpp='$CXXCPP $CPPFLAGS' |
| 21080 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 21104 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| 21081 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | 21105 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
| 21082 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | 21106 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
