7866 as_fn_error $? "You cannot build a minimal JVM for a 64-bit machine." "$LINENO" 5 |
7866 as_fn_error $? "You cannot build a minimal JVM for a 64-bit machine." "$LINENO" 5 |
7867 fi |
7867 fi |
7868 fi |
7868 fi |
7869 |
7869 |
7870 # Replace the commas with AND for use in the build directory name. |
7870 # Replace the commas with AND for use in the build directory name. |
7871 ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'` |
7871 ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/g'` |
7872 COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/'` |
7872 COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/'` |
7873 if test "x$COUNT_VARIANTS" != "x,1"; then |
7873 if test "x$COUNT_VARIANTS" != "x,1"; then |
7874 BUILDING_MULTIPLE_JVM_VARIANTS=yes |
7874 BUILDING_MULTIPLE_JVM_VARIANTS=yes |
7875 else |
7875 else |
7876 BUILDING_MULTIPLE_JVM_VARIANTS=no |
7876 BUILDING_MULTIPLE_JVM_VARIANTS=no |
19071 |
19071 |
19072 # On windows, only cl.exe is supported. |
19072 # On windows, only cl.exe is supported. |
19073 # On Solaris, cc is preferred to gcc. |
19073 # On Solaris, cc is preferred to gcc. |
19074 # Elsewhere, gcc is preferred to cc. |
19074 # Elsewhere, gcc is preferred to cc. |
19075 |
19075 |
19076 if test "x$CC" != x; then |
19076 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
19077 COMPILER_CHECK_LIST="$CC" |
|
19078 elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
|
19079 COMPILER_CHECK_LIST="cl" |
19077 COMPILER_CHECK_LIST="cl" |
19080 elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then |
19078 elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then |
19081 COMPILER_CHECK_LIST="cc gcc" |
19079 COMPILER_CHECK_LIST="cc gcc" |
19082 else |
19080 else |
19083 COMPILER_CHECK_LIST="gcc cc" |
19081 COMPILER_CHECK_LIST="gcc cc" |
19084 fi |
19082 fi |
19085 |
19083 |
19086 |
19084 |
19087 COMPILER_NAME=C |
19085 COMPILER_NAME=C |
19088 |
19086 SEARCH_LIST="$COMPILER_CHECK_LIST" |
19089 CC= |
19087 |
19090 # If TOOLS_DIR is set, check for all compiler names in there first |
19088 if test "x$CC" != x; then |
19091 # before checking the rest of the PATH. |
19089 # User has supplied compiler name already, always let that override. |
19092 if test -n "$TOOLS_DIR"; then |
19090 { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied compiler CC=$CC" >&5 |
19093 PATH_save="$PATH" |
19091 $as_echo "$as_me: Will use user supplied compiler CC=$CC" >&6;} |
19094 PATH="$TOOLS_DIR" |
19092 if test "x`basename $CC`" = "x$CC"; then |
19095 for ac_prog in $COMPILER_CHECK_LIST |
19093 # A command without a complete path is provided, search $PATH. |
|
19094 |
|
19095 for ac_prog in $CC |
|
19096 do |
|
19097 # Extract the first word of "$ac_prog", so it can be a program name with args. |
|
19098 set dummy $ac_prog; ac_word=$2 |
|
19099 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
|
19100 $as_echo_n "checking for $ac_word... " >&6; } |
|
19101 if ${ac_cv_path_POTENTIAL_CC+:} false; then : |
|
19102 $as_echo_n "(cached) " >&6 |
|
19103 else |
|
19104 case $POTENTIAL_CC in |
|
19105 [\\/]* | ?:[\\/]*) |
|
19106 ac_cv_path_POTENTIAL_CC="$POTENTIAL_CC" # Let the user override the test with a path. |
|
19107 ;; |
|
19108 *) |
|
19109 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
|
19110 for as_dir in $PATH |
|
19111 do |
|
19112 IFS=$as_save_IFS |
|
19113 test -z "$as_dir" && as_dir=. |
|
19114 for ac_exec_ext in '' $ac_executable_extensions; do |
|
19115 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
19116 ac_cv_path_POTENTIAL_CC="$as_dir/$ac_word$ac_exec_ext" |
|
19117 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
|
19118 break 2 |
|
19119 fi |
|
19120 done |
|
19121 done |
|
19122 IFS=$as_save_IFS |
|
19123 |
|
19124 ;; |
|
19125 esac |
|
19126 fi |
|
19127 POTENTIAL_CC=$ac_cv_path_POTENTIAL_CC |
|
19128 if test -n "$POTENTIAL_CC"; then |
|
19129 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POTENTIAL_CC" >&5 |
|
19130 $as_echo "$POTENTIAL_CC" >&6; } |
|
19131 else |
|
19132 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
|
19133 $as_echo "no" >&6; } |
|
19134 fi |
|
19135 |
|
19136 |
|
19137 test -n "$POTENTIAL_CC" && break |
|
19138 done |
|
19139 |
|
19140 if test "x$POTENTIAL_CC" != x; then |
|
19141 CC=$POTENTIAL_CC |
|
19142 else |
|
19143 as_fn_error $? "User supplied compiler CC=$CC could not be found" "$LINENO" 5 |
|
19144 fi |
|
19145 else |
|
19146 # Otherwise it might already be a complete path |
|
19147 if test ! -x "$CC"; then |
|
19148 as_fn_error $? "User supplied compiler CC=$CC does not exist" "$LINENO" 5 |
|
19149 fi |
|
19150 fi |
|
19151 else |
|
19152 # No user supplied value. Locate compiler ourselves |
|
19153 CC= |
|
19154 # If TOOLS_DIR is set, check for all compiler names in there first |
|
19155 # before checking the rest of the PATH. |
|
19156 if test -n "$TOOLS_DIR"; then |
|
19157 PATH_save="$PATH" |
|
19158 PATH="$TOOLS_DIR" |
|
19159 for ac_prog in $SEARCH_LIST |
19096 do |
19160 do |
19097 # Extract the first word of "$ac_prog", so it can be a program name with args. |
19161 # Extract the first word of "$ac_prog", so it can be a program name with args. |
19098 set dummy $ac_prog; ac_word=$2 |
19162 set dummy $ac_prog; ac_word=$2 |
19099 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
19163 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
19100 $as_echo_n "checking for $ac_word... " >&6; } |
19164 $as_echo_n "checking for $ac_word... " >&6; } |
19135 |
19199 |
19136 |
19200 |
19137 test -n "$TOOLS_DIR_CC" && break |
19201 test -n "$TOOLS_DIR_CC" && break |
19138 done |
19202 done |
19139 |
19203 |
19140 CC=$TOOLS_DIR_CC |
19204 CC=$TOOLS_DIR_CC |
19141 PATH="$PATH_save" |
19205 PATH="$PATH_save" |
19142 fi |
19206 fi |
19143 |
19207 |
19144 # AC_PATH_PROGS can't be run multiple times with the same variable, |
19208 # AC_PATH_PROGS can't be run multiple times with the same variable, |
19145 # so create a new name for this run. |
19209 # so create a new name for this run. |
19146 if test "x$CC" = x; then |
19210 if test "x$CC" = x; then |
19147 for ac_prog in $COMPILER_CHECK_LIST |
19211 for ac_prog in $SEARCH_LIST |
19148 do |
19212 do |
19149 # Extract the first word of "$ac_prog", so it can be a program name with args. |
19213 # Extract the first word of "$ac_prog", so it can be a program name with args. |
19150 set dummy $ac_prog; ac_word=$2 |
19214 set dummy $ac_prog; ac_word=$2 |
19151 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
19215 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
19152 $as_echo_n "checking for $ac_word... " >&6; } |
19216 $as_echo_n "checking for $ac_word... " >&6; } |
20650 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
20717 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
20651 |
20718 |
20652 |
20719 |
20653 ### Locate C++ compiler (CXX) |
20720 ### Locate C++ compiler (CXX) |
20654 |
20721 |
20655 if test "x$CXX" != x; then |
20722 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
20656 COMPILER_CHECK_LIST="$CXX" |
|
20657 elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
|
20658 COMPILER_CHECK_LIST="cl" |
20723 COMPILER_CHECK_LIST="cl" |
20659 elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then |
20724 elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then |
20660 COMPILER_CHECK_LIST="CC g++" |
20725 COMPILER_CHECK_LIST="CC g++" |
20661 else |
20726 else |
20662 COMPILER_CHECK_LIST="g++ CC" |
20727 COMPILER_CHECK_LIST="g++ CC" |
20663 fi |
20728 fi |
20664 |
20729 |
20665 |
20730 |
20666 COMPILER_NAME=C++ |
20731 COMPILER_NAME=C++ |
20667 |
20732 SEARCH_LIST="$COMPILER_CHECK_LIST" |
20668 CXX= |
20733 |
20669 # If TOOLS_DIR is set, check for all compiler names in there first |
20734 if test "x$CXX" != x; then |
20670 # before checking the rest of the PATH. |
20735 # User has supplied compiler name already, always let that override. |
20671 if test -n "$TOOLS_DIR"; then |
20736 { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied compiler CXX=$CXX" >&5 |
20672 PATH_save="$PATH" |
20737 $as_echo "$as_me: Will use user supplied compiler CXX=$CXX" >&6;} |
20673 PATH="$TOOLS_DIR" |
20738 if test "x`basename $CXX`" = "x$CXX"; then |
20674 for ac_prog in $COMPILER_CHECK_LIST |
20739 # A command without a complete path is provided, search $PATH. |
|
20740 |
|
20741 for ac_prog in $CXX |
|
20742 do |
|
20743 # Extract the first word of "$ac_prog", so it can be a program name with args. |
|
20744 set dummy $ac_prog; ac_word=$2 |
|
20745 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
|
20746 $as_echo_n "checking for $ac_word... " >&6; } |
|
20747 if ${ac_cv_path_POTENTIAL_CXX+:} false; then : |
|
20748 $as_echo_n "(cached) " >&6 |
|
20749 else |
|
20750 case $POTENTIAL_CXX in |
|
20751 [\\/]* | ?:[\\/]*) |
|
20752 ac_cv_path_POTENTIAL_CXX="$POTENTIAL_CXX" # Let the user override the test with a path. |
|
20753 ;; |
|
20754 *) |
|
20755 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
|
20756 for as_dir in $PATH |
|
20757 do |
|
20758 IFS=$as_save_IFS |
|
20759 test -z "$as_dir" && as_dir=. |
|
20760 for ac_exec_ext in '' $ac_executable_extensions; do |
|
20761 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
20762 ac_cv_path_POTENTIAL_CXX="$as_dir/$ac_word$ac_exec_ext" |
|
20763 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
|
20764 break 2 |
|
20765 fi |
|
20766 done |
|
20767 done |
|
20768 IFS=$as_save_IFS |
|
20769 |
|
20770 ;; |
|
20771 esac |
|
20772 fi |
|
20773 POTENTIAL_CXX=$ac_cv_path_POTENTIAL_CXX |
|
20774 if test -n "$POTENTIAL_CXX"; then |
|
20775 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POTENTIAL_CXX" >&5 |
|
20776 $as_echo "$POTENTIAL_CXX" >&6; } |
|
20777 else |
|
20778 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
|
20779 $as_echo "no" >&6; } |
|
20780 fi |
|
20781 |
|
20782 |
|
20783 test -n "$POTENTIAL_CXX" && break |
|
20784 done |
|
20785 |
|
20786 if test "x$POTENTIAL_CXX" != x; then |
|
20787 CXX=$POTENTIAL_CXX |
|
20788 else |
|
20789 as_fn_error $? "User supplied compiler CXX=$CXX could not be found" "$LINENO" 5 |
|
20790 fi |
|
20791 else |
|
20792 # Otherwise it might already be a complete path |
|
20793 if test ! -x "$CXX"; then |
|
20794 as_fn_error $? "User supplied compiler CXX=$CXX does not exist" "$LINENO" 5 |
|
20795 fi |
|
20796 fi |
|
20797 else |
|
20798 # No user supplied value. Locate compiler ourselves |
|
20799 CXX= |
|
20800 # If TOOLS_DIR is set, check for all compiler names in there first |
|
20801 # before checking the rest of the PATH. |
|
20802 if test -n "$TOOLS_DIR"; then |
|
20803 PATH_save="$PATH" |
|
20804 PATH="$TOOLS_DIR" |
|
20805 for ac_prog in $SEARCH_LIST |
20675 do |
20806 do |
20676 # Extract the first word of "$ac_prog", so it can be a program name with args. |
20807 # Extract the first word of "$ac_prog", so it can be a program name with args. |
20677 set dummy $ac_prog; ac_word=$2 |
20808 set dummy $ac_prog; ac_word=$2 |
20678 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
20809 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
20679 $as_echo_n "checking for $ac_word... " >&6; } |
20810 $as_echo_n "checking for $ac_word... " >&6; } |
20714 |
20845 |
20715 |
20846 |
20716 test -n "$TOOLS_DIR_CXX" && break |
20847 test -n "$TOOLS_DIR_CXX" && break |
20717 done |
20848 done |
20718 |
20849 |
20719 CXX=$TOOLS_DIR_CXX |
20850 CXX=$TOOLS_DIR_CXX |
20720 PATH="$PATH_save" |
20851 PATH="$PATH_save" |
20721 fi |
20852 fi |
20722 |
20853 |
20723 # AC_PATH_PROGS can't be run multiple times with the same variable, |
20854 # AC_PATH_PROGS can't be run multiple times with the same variable, |
20724 # so create a new name for this run. |
20855 # so create a new name for this run. |
20725 if test "x$CXX" = x; then |
20856 if test "x$CXX" = x; then |
20726 for ac_prog in $COMPILER_CHECK_LIST |
20857 for ac_prog in $SEARCH_LIST |
20727 do |
20858 do |
20728 # Extract the first word of "$ac_prog", so it can be a program name with args. |
20859 # Extract the first word of "$ac_prog", so it can be a program name with args. |
20729 set dummy $ac_prog; ac_word=$2 |
20860 set dummy $ac_prog; ac_word=$2 |
20730 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
20861 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
20731 $as_echo_n "checking for $ac_word... " >&6; } |
20862 $as_echo_n "checking for $ac_word... " >&6; } |