1.1 --- a/common/autoconf/generated-configure.sh Wed Mar 21 09:19:00 2018 -0700
1.2 +++ b/common/autoconf/generated-configure.sh Thu Apr 05 07:59:52 2018 -0700
1.3 @@ -634,6 +634,7 @@
1.4 ENABLE_INTREE_EC
1.5 SALIB_NAME
1.6 HOTSPOT_MAKE_ARGS
1.7 +MSVCR_DLL
1.8 LIBCXX
1.9 LLVM_LIBS
1.10 LLVM_LDFLAGS
1.11 @@ -661,11 +662,8 @@
1.12 X_CFLAGS
1.13 XMKMF
1.14 FIXPATH
1.15 -CXXFLAGS_DEBUG_SYMBOLS
1.16 -CFLAGS_DEBUG_SYMBOLS
1.17 ZIP_DEBUGINFO_FILES
1.18 ENABLE_DEBUG_SYMBOLS
1.19 -USING_BROKEN_SUSE_LD
1.20 COMPILER_SUPPORTS_TARGET_BITS_FLAG
1.21 ZERO_ARCHFLAG
1.22 LDFLAGS_CXX_JDK
1.23 @@ -678,15 +676,12 @@
1.24 CFLAGS_JDKEXE
1.25 CFLAGS_JDKLIB
1.26 MACOSX_VERSION_MIN
1.27 -PACKAGE_PATH
1.28 NO_LIFETIME_DSE_CFLAG
1.29 NO_DELETE_NULL_POINTER_CHECKS_CFLAG
1.30 -CXXSTD_CXXFLAG
1.31 LEGACY_EXTRA_LDFLAGS
1.32 LEGACY_EXTRA_CXXFLAGS
1.33 LEGACY_EXTRA_CFLAGS
1.34 -CXX_FLAG_DEPS
1.35 -C_FLAG_DEPS
1.36 +CXXSTD_CXXFLAG
1.37 CXX_O_FLAG_NONE
1.38 CXX_O_FLAG_NORM
1.39 CXX_O_FLAG_HI
1.40 @@ -695,70 +690,74 @@
1.41 C_O_FLAG_NORM
1.42 C_O_FLAG_HI
1.43 C_O_FLAG_HIGHEST
1.44 +CXXFLAGS_DEBUG_SYMBOLS
1.45 +CFLAGS_DEBUG_SYMBOLS
1.46 +CXX_FLAG_DEPS
1.47 +C_FLAG_DEPS
1.48 +SET_SHARED_LIBRARY_MAPFILE
1.49 +SET_SHARED_LIBRARY_NAME
1.50 +SET_SHARED_LIBRARY_ORIGIN
1.51 +SET_EXECUTABLE_ORIGIN
1.52 +SHARED_LIBRARY_FLAGS
1.53 +CXX_FLAG_REORDER
1.54 +C_FLAG_REORDER
1.55 +RC_FLAGS
1.56 +AR_OUT_OPTION
1.57 +LD_OUT_OPTION
1.58 +EXE_OUT_OPTION
1.59 +CC_OUT_OPTION
1.60 POST_MCS_CMD
1.61 POST_STRIP_CMD
1.62 -SET_EXECUTABLE_ORIGIN
1.63 -SET_SHARED_LIBRARY_ORIGIN
1.64 -CXX_FLAG_REORDER
1.65 -C_FLAG_REORDER
1.66 -SET_SHARED_LIBRARY_MAPFILE
1.67 -SET_SHARED_LIBRARY_NAME
1.68 -SHARED_LIBRARY_FLAGS
1.69 -EXE_SUFFIX
1.70 -STATIC_LIBRARY_SUFFIX
1.71 -SHARED_LIBRARY_SUFFIX
1.72 -LIBRARY_PREFIX
1.73 -STATIC_LIBRARY
1.74 -SHARED_LIBRARY
1.75 -OBJ_SUFFIX
1.76 -COMPILER_NAME
1.77 +ARFLAGS
1.78 +COMPILER_TARGET_BITS_FLAG
1.79 JT_HOME
1.80 JTREGEXE
1.81 +USING_BROKEN_SUSE_LD
1.82 +PACKAGE_PATH
1.83 +LDEXECXX
1.84 +LDEXE
1.85 +USE_CLANG
1.86 +HOTSPOT_LD
1.87 +HOTSPOT_CXX
1.88 +HOTSPOT_RC
1.89 +HOTSPOT_MT
1.90 +BUILD_LD
1.91 +BUILD_CXX
1.92 +BUILD_CC
1.93 ac_ct_OBJDUMP
1.94 OBJDUMP
1.95 ac_ct_OBJCOPY
1.96 OBJCOPY
1.97 -ac_ct_STRIP
1.98 ac_ct_NM
1.99 OTOOL
1.100 +ac_ct_STRIP
1.101 MCS
1.102 -STRIP
1.103 GNM
1.104 NM
1.105 -AS
1.106 -CXXCPP
1.107 -CPP
1.108 -COMPILER_TYPE
1.109 -RC_FLAGS
1.110 +STRIP
1.111 DUMPBIN
1.112 -WINAR
1.113 -HOTSPOT_RC
1.114 -HOTSPOT_MT
1.115 RC
1.116 MT
1.117 -WINLD
1.118 -HOTSPOT_LD
1.119 -HOTSPOT_CXX
1.120 -ARFLAGS
1.121 -ac_ct_AR
1.122 -AR
1.123 -LDEXECXX
1.124 -LDCXX
1.125 -LDEXE
1.126 -LD
1.127 +LIPO
1.128 ac_ct_OBJC
1.129 OBJCFLAGS
1.130 OBJC
1.131 -CXX_VERSION
1.132 -CC_VERSION
1.133 +ac_ct_AR
1.134 +AR
1.135 +AS
1.136 +LDCXX
1.137 +LD
1.138 +CXXCPP
1.139 +CPP
1.140 +CXX_VERSION_NUMBER
1.141 +CC_VERSION_NUMBER
1.142 ac_ct_CXX
1.143 CXXFLAGS
1.144 CXX
1.145 ac_ct_PROPER_COMPILER_CXX
1.146 PROPER_COMPILER_CXX
1.147 +TOOLS_DIR_CXX
1.148 POTENTIAL_CXX
1.149 -TOOLS_DIR_CXX
1.150 -COMPILER_TARGET_BITS_FLAG
1.151 OBJEXT
1.152 EXEEXT
1.153 ac_ct_CC
1.154 @@ -768,23 +767,23 @@
1.155 CC
1.156 ac_ct_PROPER_COMPILER_CC
1.157 PROPER_COMPILER_CC
1.158 +TOOLS_DIR_CC
1.159 POTENTIAL_CC
1.160 -TOOLS_DIR_CC
1.161 -SDKPATH
1.162 -XCODEBUILD
1.163 -SET_DEVELOPER_DIR
1.164 -BUILD_LD
1.165 -BUILD_CXX
1.166 -BUILD_CC
1.167 -MSVCR_DLL
1.168 VS_PATH
1.169 VS_LIB
1.170 VS_INCLUDE
1.171 CYGWIN_LINK
1.172 -AR_OUT_OPTION
1.173 -LD_OUT_OPTION
1.174 -EXE_OUT_OPTION
1.175 -CC_OUT_OPTION
1.176 +SDKPATH
1.177 +XCODEBUILD
1.178 +SET_DEVELOPER_DIR
1.179 +EXE_SUFFIX
1.180 +OBJ_SUFFIX
1.181 +STATIC_LIBRARY
1.182 +SHARED_LIBRARY
1.183 +STATIC_LIBRARY_SUFFIX
1.184 +SHARED_LIBRARY_SUFFIX
1.185 +LIBRARY_PREFIX
1.186 +TOOLCHAIN_TYPE
1.187 BUILD_HOTSPOT
1.188 HOTSPOT_DIST
1.189 BUILD_OUTPUT
1.190 @@ -1053,10 +1052,7 @@
1.191 with_override_nashorn
1.192 with_override_jdk
1.193 with_import_hotspot
1.194 -with_msvcr_dll
1.195 -with_dxsdk
1.196 -with_dxsdk_lib
1.197 -with_dxsdk_include
1.198 +with_toolchain_type
1.199 with_jtreg
1.200 with_extra_cflags
1.201 with_extra_cxxflags
1.202 @@ -1077,6 +1073,10 @@
1.203 with_giflib
1.204 with_zlib
1.205 with_stdc__lib
1.206 +with_msvcr_dll
1.207 +with_dxsdk
1.208 +with_dxsdk_lib
1.209 +with_dxsdk_include
1.210 with_num_cores
1.211 with_memory_size
1.212 with_jobs
1.213 @@ -1146,9 +1146,6 @@
1.214 XATTR
1.215 CODESIGN
1.216 PKG_CONFIG
1.217 -BUILD_CC
1.218 -BUILD_CXX
1.219 -BUILD_LD
1.220 CC
1.221 CFLAGS
1.222 LDFLAGS
1.223 @@ -1157,18 +1154,22 @@
1.224 CXX
1.225 CXXFLAGS
1.226 CCC
1.227 -OBJC
1.228 -OBJCFLAGS
1.229 -AR
1.230 CPP
1.231 CXXCPP
1.232 AS
1.233 +AR
1.234 +OBJC
1.235 +OBJCFLAGS
1.236 +LIPO
1.237 +STRIP
1.238 NM
1.239 GNM
1.240 -STRIP
1.241 MCS
1.242 OBJCOPY
1.243 OBJDUMP
1.244 +BUILD_CC
1.245 +BUILD_CXX
1.246 +BUILD_LD
1.247 JTREGEXE
1.248 XMKMF
1.249 FREETYPE_CFLAGS
1.250 @@ -1890,14 +1891,8 @@
1.251 --with-import-hotspot import hotspot binaries from this jdk image or
1.252 hotspot build dist dir instead of building from
1.253 source
1.254 - --with-msvcr-dll copy this msvcr100.dll into the built JDK (Windows
1.255 - only) [probed]
1.256 - --with-dxsdk Deprecated. Option is kept for backwards
1.257 - compatibility and is ignored
1.258 - --with-dxsdk-lib Deprecated. Option is kept for backwards
1.259 - compatibility and is ignored
1.260 - --with-dxsdk-include Deprecated. Option is kept for backwards
1.261 - compatibility and is ignored
1.262 + --with-toolchain-type the toolchain type (or family) to use, use '--help'
1.263 + to show possible values [platform dependent]
1.264 --with-jtreg Regression Test Harness [probed]
1.265 --with-extra-cflags extra flags to be used when compiling jdk c-files
1.266 --with-extra-cxxflags extra flags to be used when compiling jdk c++-files
1.267 @@ -1924,6 +1919,14 @@
1.268 force linking of the C++ runtime on Linux to either
1.269 static or dynamic, default is static with dynamic as
1.270 fallback
1.271 + --with-msvcr-dll copy this msvcr100.dll into the built JDK (Windows
1.272 + only) [probed]
1.273 + --with-dxsdk Deprecated. Option is kept for backwards
1.274 + compatibility and is ignored
1.275 + --with-dxsdk-lib Deprecated. Option is kept for backwards
1.276 + compatibility and is ignored
1.277 + --with-dxsdk-include Deprecated. Option is kept for backwards
1.278 + compatibility and is ignored
1.279 --with-num-cores number of cores in the build system, e.g.
1.280 --with-num-cores=8 [probed]
1.281 --with-memory-size memory (in MB) available in the build system, e.g.
1.282 @@ -1993,9 +1996,6 @@
1.283 XATTR Override default value for XATTR
1.284 CODESIGN Override default value for CODESIGN
1.285 PKG_CONFIG path to pkg-config utility
1.286 - BUILD_CC Override default value for BUILD_CC
1.287 - BUILD_CXX Override default value for BUILD_CXX
1.288 - BUILD_LD Override default value for BUILD_LD
1.289 CC C compiler command
1.290 CFLAGS C compiler flags
1.291 LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
1.292 @@ -2005,18 +2005,22 @@
1.293 you have headers in a nonstandard directory <include dir>
1.294 CXX C++ compiler command
1.295 CXXFLAGS C++ compiler flags
1.296 - OBJC Objective C compiler command
1.297 - OBJCFLAGS Objective C compiler flags
1.298 - AR Override default value for AR
1.299 CPP C preprocessor
1.300 CXXCPP C++ preprocessor
1.301 AS Override default value for AS
1.302 + AR Override default value for AR
1.303 + OBJC Objective C compiler command
1.304 + OBJCFLAGS Objective C compiler flags
1.305 + LIPO Override default value for LIPO
1.306 + STRIP Override default value for STRIP
1.307 NM Override default value for NM
1.308 GNM Override default value for GNM
1.309 - STRIP Override default value for STRIP
1.310 MCS Override default value for MCS
1.311 OBJCOPY Override default value for OBJCOPY
1.312 OBJDUMP Override default value for OBJDUMP
1.313 + BUILD_CC Override default value for BUILD_CC
1.314 + BUILD_CXX Override default value for BUILD_CXX
1.315 + BUILD_LD Override default value for BUILD_LD
1.316 JTREGEXE Override default value for JTREGEXE
1.317 XMKMF Path to xmkmf, Makefile generator for X Window System
1.318 FREETYPE_CFLAGS
1.319 @@ -2187,6 +2191,80 @@
1.320
1.321 } # ac_fn_cxx_try_compile
1.322
1.323 +# ac_fn_c_try_cpp LINENO
1.324 +# ----------------------
1.325 +# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
1.326 +ac_fn_c_try_cpp ()
1.327 +{
1.328 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.329 + if { { ac_try="$ac_cpp conftest.$ac_ext"
1.330 +case "(($ac_try" in
1.331 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.332 + *) ac_try_echo=$ac_try;;
1.333 +esac
1.334 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1.335 +$as_echo "$ac_try_echo"; } >&5
1.336 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
1.337 + ac_status=$?
1.338 + if test -s conftest.err; then
1.339 + grep -v '^ *+' conftest.err >conftest.er1
1.340 + cat conftest.er1 >&5
1.341 + mv -f conftest.er1 conftest.err
1.342 + fi
1.343 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1.344 + test $ac_status = 0; } > conftest.i && {
1.345 + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1.346 + test ! -s conftest.err
1.347 + }; then :
1.348 + ac_retval=0
1.349 +else
1.350 + $as_echo "$as_me: failed program was:" >&5
1.351 +sed 's/^/| /' conftest.$ac_ext >&5
1.352 +
1.353 + ac_retval=1
1.354 +fi
1.355 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.356 + as_fn_set_status $ac_retval
1.357 +
1.358 +} # ac_fn_c_try_cpp
1.359 +
1.360 +# ac_fn_cxx_try_cpp LINENO
1.361 +# ------------------------
1.362 +# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
1.363 +ac_fn_cxx_try_cpp ()
1.364 +{
1.365 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.366 + if { { ac_try="$ac_cpp conftest.$ac_ext"
1.367 +case "(($ac_try" in
1.368 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.369 + *) ac_try_echo=$ac_try;;
1.370 +esac
1.371 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1.372 +$as_echo "$ac_try_echo"; } >&5
1.373 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
1.374 + ac_status=$?
1.375 + if test -s conftest.err; then
1.376 + grep -v '^ *+' conftest.err >conftest.er1
1.377 + cat conftest.er1 >&5
1.378 + mv -f conftest.er1 conftest.err
1.379 + fi
1.380 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1.381 + test $ac_status = 0; } > conftest.i && {
1.382 + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
1.383 + test ! -s conftest.err
1.384 + }; then :
1.385 + ac_retval=0
1.386 +else
1.387 + $as_echo "$as_me: failed program was:" >&5
1.388 +sed 's/^/| /' conftest.$ac_ext >&5
1.389 +
1.390 + ac_retval=1
1.391 +fi
1.392 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.393 + as_fn_set_status $ac_retval
1.394 +
1.395 +} # ac_fn_cxx_try_cpp
1.396 +
1.397 # ac_fn_objc_try_compile LINENO
1.398 # -----------------------------
1.399 # Try to compile conftest.$ac_ext, and return whether this succeeded.
1.400 @@ -2225,80 +2303,6 @@
1.401
1.402 } # ac_fn_objc_try_compile
1.403
1.404 -# ac_fn_c_try_cpp LINENO
1.405 -# ----------------------
1.406 -# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
1.407 -ac_fn_c_try_cpp ()
1.408 -{
1.409 - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.410 - if { { ac_try="$ac_cpp conftest.$ac_ext"
1.411 -case "(($ac_try" in
1.412 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.413 - *) ac_try_echo=$ac_try;;
1.414 -esac
1.415 -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1.416 -$as_echo "$ac_try_echo"; } >&5
1.417 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
1.418 - ac_status=$?
1.419 - if test -s conftest.err; then
1.420 - grep -v '^ *+' conftest.err >conftest.er1
1.421 - cat conftest.er1 >&5
1.422 - mv -f conftest.er1 conftest.err
1.423 - fi
1.424 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1.425 - test $ac_status = 0; } > conftest.i && {
1.426 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1.427 - test ! -s conftest.err
1.428 - }; then :
1.429 - ac_retval=0
1.430 -else
1.431 - $as_echo "$as_me: failed program was:" >&5
1.432 -sed 's/^/| /' conftest.$ac_ext >&5
1.433 -
1.434 - ac_retval=1
1.435 -fi
1.436 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.437 - as_fn_set_status $ac_retval
1.438 -
1.439 -} # ac_fn_c_try_cpp
1.440 -
1.441 -# ac_fn_cxx_try_cpp LINENO
1.442 -# ------------------------
1.443 -# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
1.444 -ac_fn_cxx_try_cpp ()
1.445 -{
1.446 - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.447 - if { { ac_try="$ac_cpp conftest.$ac_ext"
1.448 -case "(($ac_try" in
1.449 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.450 - *) ac_try_echo=$ac_try;;
1.451 -esac
1.452 -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1.453 -$as_echo "$ac_try_echo"; } >&5
1.454 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
1.455 - ac_status=$?
1.456 - if test -s conftest.err; then
1.457 - grep -v '^ *+' conftest.err >conftest.er1
1.458 - cat conftest.er1 >&5
1.459 - mv -f conftest.er1 conftest.err
1.460 - fi
1.461 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1.462 - test $ac_status = 0; } > conftest.i && {
1.463 - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
1.464 - test ! -s conftest.err
1.465 - }; then :
1.466 - ac_retval=0
1.467 -else
1.468 - $as_echo "$as_me: failed program was:" >&5
1.469 -sed 's/^/| /' conftest.$ac_ext >&5
1.470 -
1.471 - ac_retval=1
1.472 -fi
1.473 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.474 - as_fn_set_status $ac_retval
1.475 -
1.476 -} # ac_fn_cxx_try_cpp
1.477 -
1.478 # ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
1.479 # ---------------------------------------------------------
1.480 # Tests whether HEADER exists, giving a warning if it cannot be compiled using
1.481 @@ -3261,7 +3265,7 @@
1.482
1.483 # Include these first...
1.484 #
1.485 -# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
1.486 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
1.487 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.488 #
1.489 # This code is free software; you can redistribute it and/or modify it
1.490 @@ -3570,7 +3574,7 @@
1.491
1.492
1.493 #
1.494 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
1.495 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
1.496 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.497 #
1.498 # This code is free software; you can redistribute it and/or modify it
1.499 @@ -3614,7 +3618,95 @@
1.500
1.501
1.502 #
1.503 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
1.504 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
1.505 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.506 +#
1.507 +# This code is free software; you can redistribute it and/or modify it
1.508 +# under the terms of the GNU General Public License version 2 only, as
1.509 +# published by the Free Software Foundation. Oracle designates this
1.510 +# particular file as subject to the "Classpath" exception as provided
1.511 +# by Oracle in the LICENSE file that accompanied this code.
1.512 +#
1.513 +# This code is distributed in the hope that it will be useful, but WITHOUT
1.514 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
1.515 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
1.516 +# version 2 for more details (a copy is included in the LICENSE file that
1.517 +# accompanied this code).
1.518 +#
1.519 +# You should have received a copy of the GNU General Public License version
1.520 +# 2 along with this work; if not, write to the Free Software Foundation,
1.521 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
1.522 +#
1.523 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
1.524 +# or visit www.oracle.com if you need additional information or have any
1.525 +# questions.
1.526 +#
1.527 +
1.528 +
1.529 +
1.530 +
1.531 +
1.532 +# Documentation on common flags used for solstudio in HIGHEST.
1.533 +#
1.534 +# WARNING: Use of OPTIMIZATION_LEVEL=HIGHEST in your Makefile needs to be
1.535 +# done with care, there are some assumptions below that need to
1.536 +# be understood about the use of pointers, and IEEE behavior.
1.537 +#
1.538 +# -fns: Use non-standard floating point mode (not IEEE 754)
1.539 +# -fsimple: Do some simplification of floating point arithmetic (not IEEE 754)
1.540 +# -fsingle: Use single precision floating point with 'float'
1.541 +# -xalias_level=basic: Assume memory references via basic pointer types do not alias
1.542 +# (Source with excessing pointer casting and data access with mixed
1.543 +# pointer types are not recommended)
1.544 +# -xbuiltin=%all: Use intrinsic or inline versions for math/std functions
1.545 +# (If you expect perfect errno behavior, do not use this)
1.546 +# -xdepend: Loop data dependency optimizations (need -xO3 or higher)
1.547 +# -xrestrict: Pointer parameters to functions do not overlap
1.548 +# (Similar to -xalias_level=basic usage, but less obvious sometimes.
1.549 +# If you pass in multiple pointers to the same data, do not use this)
1.550 +# -xlibmil: Inline some library routines
1.551 +# (If you expect perfect errno behavior, do not use this)
1.552 +# -xlibmopt: Use optimized math routines (CURRENTLY DISABLED)
1.553 +# (If you expect perfect errno behavior, do not use this)
1.554 +# Can cause undefined external on Solaris 8 X86 on __sincos, removing for now
1.555 +
1.556 + # FIXME: this will never happen since sparc != sparcv9, ie 32 bit, which we don't build anymore.
1.557 + # Bug?
1.558 + #if test "x$OPENJDK_TARGET_CPU" = xsparc; then
1.559 + # CFLAGS_JDK="${CFLAGS_JDK} -xmemalign=4s"
1.560 + # CXXFLAGS_JDK="${CXXFLAGS_JDK} -xmemalign=4s"
1.561 + #fi
1.562 +
1.563 +
1.564 +
1.565 +
1.566 +
1.567 +
1.568 +# FLAGS_C_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
1.569 +# [RUN-IF-FALSE])
1.570 +# ------------------------------------------------------------
1.571 +# Check that the C compiler supports an argument
1.572 +
1.573 +
1.574 +# FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
1.575 +# [RUN-IF-FALSE])
1.576 +# ------------------------------------------------------------
1.577 +# Check that the C++ compiler supports an argument
1.578 +
1.579 +
1.580 +# FLAGS_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
1.581 +# [RUN-IF-FALSE])
1.582 +# ------------------------------------------------------------
1.583 +# Check that the C and C++ compilers support an argument
1.584 +
1.585 +
1.586 +
1.587 +
1.588 +
1.589 +
1.590 +
1.591 +#
1.592 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
1.593 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.594 #
1.595 # This code is free software; you can redistribute it and/or modify it
1.596 @@ -3733,10 +3825,16 @@
1.597 PKGHANDLER_COMMAND=""
1.598 }
1.599
1.600 -
1.601 -
1.602 -#
1.603 -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
1.604 +# This function will check if we're called from the "configure" wrapper while
1.605 +# printing --help. If so, we will print out additional information that can
1.606 +# only be extracted within the autoconf script, and then exit. This must be
1.607 +# called at the very beginning in configure.ac.
1.608 +
1.609 +
1.610 +
1.611 +
1.612 +#
1.613 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
1.614 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.615 #
1.616 # This code is free software; you can redistribute it and/or modify it
1.617 @@ -3800,7 +3898,7 @@
1.618
1.619
1.620 #
1.621 -# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
1.622 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
1.623 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.624 #
1.625 # This code is free software; you can redistribute it and/or modify it
1.626 @@ -3840,6 +3938,8 @@
1.627
1.628
1.629
1.630 +
1.631 +
1.632 #
1.633 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
1.634 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.635 @@ -3964,8 +4064,37 @@
1.636 # questions.
1.637 #
1.638
1.639 +########################################################################
1.640 +# This file is responsible for detecting, verifying and setting up the
1.641 +# toolchain, i.e. the compiler, linker and related utilities. It will setup
1.642 +# proper paths to the binaries, but it will not setup any flags.
1.643 +#
1.644 +# The binaries used is determined by the toolchain type, which is the family of
1.645 +# compilers and related tools that are used.
1.646 +########################################################################
1.647 +
1.648 +
1.649 +# All valid toolchains, regardless of platform (used by help.m4)
1.650 +VALID_TOOLCHAINS_all="gcc clang solstudio xlc microsoft"
1.651 +
1.652 +# These toolchains are valid on different platforms
1.653 +VALID_TOOLCHAINS_linux="gcc clang"
1.654 +VALID_TOOLCHAINS_solaris="solstudio"
1.655 +VALID_TOOLCHAINS_macosx="gcc clang"
1.656 +VALID_TOOLCHAINS_aix="xlc"
1.657 +VALID_TOOLCHAINS_windows="microsoft"
1.658 +
1.659 +# Toolchain descriptions
1.660 +TOOLCHAIN_DESCRIPTION_clang="clang/LLVM"
1.661 +TOOLCHAIN_DESCRIPTION_gcc="GNU Compiler Collection"
1.662 +TOOLCHAIN_DESCRIPTION_microsoft="Microsoft Visual Studio"
1.663 +TOOLCHAIN_DESCRIPTION_solstudio="Oracle Solaris Studio"
1.664 +TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
1.665 +
1.666 # Prepare the system so that TOOLCHAIN_CHECK_COMPILER_VERSION can be called.
1.667 # Must have CC_VERSION_NUMBER and CXX_VERSION_NUMBER.
1.668 +# $1 - optional variable prefix for compiler and version variables (BUILD_)
1.669 +# $2 - optional variable prefix for comparable variable (OPENJDK_BUILD_)
1.670
1.671
1.672 # Check if the configured compiler (C and C++) is of a specific version or
1.673 @@ -3977,51 +4106,65 @@
1.674 # $3: block to run if the compiler is older than this version (<)
1.675
1.676
1.677 +
1.678 +# Setup a number of variables describing how native output files are
1.679 +# named on this platform/toolchain.
1.680 +
1.681 +
1.682 +# Determine which toolchain type to use, and make sure it is valid for this
1.683 +# platform. Setup various information about the selected toolchain.
1.684 +
1.685 +
1.686 +# Before we start detecting the toolchain executables, we might need some
1.687 +# special setup, e.g. additional paths etc.
1.688 +
1.689 +
1.690 +# Restore path, etc
1.691 +
1.692 +
1.693 +# Check if a compiler is of the toolchain type we expect, and save the version
1.694 +# information from it. If the compiler does not match the expected type,
1.695 +# this function will abort using AC_MSG_ERROR. If it matches, the version will
1.696 +# be stored in CC_VERSION_NUMBER/CXX_VERSION_NUMBER (as a dotted number), and
1.697 +# the full version string in CC_VERSION_STRING/CXX_VERSION_STRING.
1.698 +#
1.699 # $1 = compiler to test (CC or CXX)
1.700 # $2 = human readable name of compiler (C or C++)
1.701
1.702
1.703
1.704 -
1.705 -
1.706 +# Try to locate the given C or C++ compiler in the path, or otherwise.
1.707 +#
1.708 # $1 = compiler to test (CC or CXX)
1.709 # $2 = human readable name of compiler (C or C++)
1.710 # $3 = list of compiler names to search for
1.711
1.712
1.713 -
1.714 -
1.715 -
1.716 -
1.717 -
1.718 -
1.719 -
1.720 -
1.721 -
1.722 -
1.723 -
1.724 -# TOOLCHAIN_C_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
1.725 -# [RUN-IF-FALSE])
1.726 -# ------------------------------------------------------------
1.727 -# Check that the C compiler supports an argument
1.728 -
1.729 -
1.730 -# TOOLCHAIN_CXX_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
1.731 -# [RUN-IF-FALSE])
1.732 -# ------------------------------------------------------------
1.733 -# Check that the C++ compiler supports an argument
1.734 -
1.735 -
1.736 -# TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
1.737 -# [RUN-IF-FALSE])
1.738 -# ------------------------------------------------------------
1.739 -# Check that the C and C++ compilers support an argument
1.740 -
1.741 -
1.742 -
1.743 -
1.744 -# Setup the JTREG paths
1.745 -
1.746 +# Detect the core components of the toolchain, i.e. the compilers (CC and CXX),
1.747 +# preprocessor (CPP and CXXCPP), the linker (LD), the assembler (AS) and the
1.748 +# archiver (AR). Verify that the compilers are correct according to the
1.749 +# toolchain type.
1.750 +
1.751 +
1.752 +# Setup additional tools that is considered a part of the toolchain, but not the
1.753 +# core part. Many of these are highly platform-specific and do not exist,
1.754 +# and/or are not needed on all platforms.
1.755 +
1.756 +
1.757 +# Setup the build tools (i.e, the compiler and linker used to build programs
1.758 +# that should be run on the build platform, not the target platform, as a build
1.759 +# helper). Since the non-cross-compile case uses the normal, target compilers
1.760 +# for this, we can only do this after these have been setup.
1.761 +
1.762 +
1.763 +# Setup legacy variables that are still needed as alternative ways to refer to
1.764 +# parts of the toolchain.
1.765 +
1.766 +
1.767 +# Do some additional checks on the detected tools.
1.768 +
1.769 +
1.770 +# Setup the JTReg Regression Test Harness.
1.771
1.772
1.773
1.774 @@ -4076,7 +4219,7 @@
1.775 #CUSTOM_AUTOCONF_INCLUDE
1.776
1.777 # Do not change or remove the following line, it is needed for consistency checks:
1.778 -DATE_WHEN_GENERATED=1521626909
1.779 +DATE_WHEN_GENERATED=1522940332
1.780
1.781 ###############################################################################
1.782 #
1.783 @@ -4087,7 +4230,25 @@
1.784 #
1.785 ###############################################################################
1.786
1.787 -# Basic initialization that must happen first of all
1.788 +# If we are requested to print additional help, do that and then exit.
1.789 +# This must be the very first call.
1.790 +
1.791 + if test "x$CONFIGURE_PRINT_TOOLCHAIN_LIST" != x; then
1.792 + $PRINTF "The following toolchains are available as arguments to --with-toolchain-type.\n"
1.793 + $PRINTF "Which are valid to use depends on the build platform.\n"
1.794 + for toolchain in $VALID_TOOLCHAINS_all; do
1.795 + # Use indirect variable referencing
1.796 + toolchain_var_name=TOOLCHAIN_DESCRIPTION_$toolchain
1.797 + TOOLCHAIN_DESCRIPTION=${!toolchain_var_name}
1.798 + $PRINTF " %-10s %s\n" $toolchain "$TOOLCHAIN_DESCRIPTION"
1.799 + done
1.800 +
1.801 + # And now exit directly
1.802 + exit 0
1.803 + fi
1.804 +
1.805 +
1.806 +# Basic initialization that must happen first of all in the normal process.
1.807
1.808 # Save the original command line. This is passed to us by the wrapper configure script.
1.809
1.810 @@ -15177,8 +15338,7 @@
1.811 done
1.812 IFS="$IFS_save"
1.813 else
1.814 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5
1.815 -$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;}
1.816 + # This is an absolute path, we can use it without further modifications.
1.817 new_path="$path"
1.818 fi
1.819
1.820 @@ -15534,8 +15694,7 @@
1.821 done
1.822 IFS="$IFS_save"
1.823 else
1.824 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5
1.825 -$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;}
1.826 + # This is an absolute path, we can use it without further modifications.
1.827 new_path="$path"
1.828 fi
1.829
1.830 @@ -15888,8 +16047,7 @@
1.831 done
1.832 IFS="$IFS_save"
1.833 else
1.834 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5
1.835 -$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;}
1.836 + # This is an absolute path, we can use it without further modifications.
1.837 new_path="$path"
1.838 fi
1.839
1.840 @@ -16247,8 +16405,7 @@
1.841 done
1.842 IFS="$IFS_save"
1.843 else
1.844 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5
1.845 -$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;}
1.846 + # This is an absolute path, we can use it without further modifications.
1.847 new_path="$path"
1.848 fi
1.849
1.850 @@ -16600,8 +16757,7 @@
1.851 done
1.852 IFS="$IFS_save"
1.853 else
1.854 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5
1.855 -$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;}
1.856 + # This is an absolute path, we can use it without further modifications.
1.857 new_path="$path"
1.858 fi
1.859
1.860 @@ -24648,16 +24804,118 @@
1.861
1.862 ###############################################################################
1.863 #
1.864 -# Setup the toolchain (compilers etc), i.e. the tools that need to be
1.865 -# cross-compilation aware.
1.866 +# Setup the toolchain (compilers etc), i.e. tools used to compile and process
1.867 +# native code.
1.868 #
1.869 ###############################################################################
1.870
1.871 -
1.872 - ###############################################################################
1.873 - #
1.874 - # Configure the development tool paths and potential sysroot.
1.875 - #
1.876 +# First determine the toolchain type (compiler family)
1.877 +
1.878 +
1.879 +# Check whether --with-toolchain-type was given.
1.880 +if test "${with_toolchain_type+set}" = set; then :
1.881 + withval=$with_toolchain_type;
1.882 +fi
1.883 +
1.884 +
1.885 + # Use indirect variable referencing
1.886 + toolchain_var_name=VALID_TOOLCHAINS_$OPENJDK_BUILD_OS
1.887 + VALID_TOOLCHAINS=${!toolchain_var_name}
1.888 + # First toolchain type in the list is the default
1.889 + DEFAULT_TOOLCHAIN=${VALID_TOOLCHAINS%% *}
1.890 +
1.891 + if test "x$with_toolchain_type" = xlist; then
1.892 + # List all toolchains
1.893 + { $as_echo "$as_me:${as_lineno-$LINENO}: The following toolchains are valid on this platform:" >&5
1.894 +$as_echo "$as_me: The following toolchains are valid on this platform:" >&6;}
1.895 + for toolchain in $VALID_TOOLCHAINS; do
1.896 + toolchain_var_name=TOOLCHAIN_DESCRIPTION_$toolchain
1.897 + TOOLCHAIN_DESCRIPTION=${!toolchain_var_name}
1.898 + $PRINTF " %-10s %s\n" $toolchain "$TOOLCHAIN_DESCRIPTION"
1.899 + done
1.900 +
1.901 + exit 0
1.902 + elif test "x$with_toolchain_type" != x; then
1.903 + # User override; check that it is valid
1.904 + if test "x${VALID_TOOLCHAINS/$with_toolchain_type/}" = "x${VALID_TOOLCHAINS}"; then
1.905 + { $as_echo "$as_me:${as_lineno-$LINENO}: Toolchain type $with_toolchain_type is not valid on this platform." >&5
1.906 +$as_echo "$as_me: Toolchain type $with_toolchain_type is not valid on this platform." >&6;}
1.907 + { $as_echo "$as_me:${as_lineno-$LINENO}: Valid toolchains: $VALID_TOOLCHAINS." >&5
1.908 +$as_echo "$as_me: Valid toolchains: $VALID_TOOLCHAINS." >&6;}
1.909 + as_fn_error $? "Cannot continue." "$LINENO" 5
1.910 + fi
1.911 + TOOLCHAIN_TYPE=$with_toolchain_type
1.912 + else
1.913 + # No flag given, use default
1.914 + TOOLCHAIN_TYPE=$DEFAULT_TOOLCHAIN
1.915 + fi
1.916 +
1.917 +
1.918 + TOOLCHAIN_CC_BINARY_clang="clang"
1.919 + TOOLCHAIN_CC_BINARY_gcc="gcc"
1.920 + TOOLCHAIN_CC_BINARY_microsoft="cl"
1.921 + TOOLCHAIN_CC_BINARY_solstudio="cc"
1.922 + TOOLCHAIN_CC_BINARY_xlc="xlc_r"
1.923 +
1.924 + TOOLCHAIN_CXX_BINARY_clang="clang++"
1.925 + TOOLCHAIN_CXX_BINARY_gcc="g++"
1.926 + TOOLCHAIN_CXX_BINARY_microsoft="cl"
1.927 + TOOLCHAIN_CXX_BINARY_solstudio="CC"
1.928 + TOOLCHAIN_CXX_BINARY_xlc="xlC_r"
1.929 +
1.930 + # Use indirect variable referencing
1.931 + toolchain_var_name=TOOLCHAIN_DESCRIPTION_$TOOLCHAIN_TYPE
1.932 + TOOLCHAIN_DESCRIPTION=${!toolchain_var_name}
1.933 + toolchain_var_name=TOOLCHAIN_CC_BINARY_$TOOLCHAIN_TYPE
1.934 + TOOLCHAIN_CC_BINARY=${!toolchain_var_name}
1.935 + toolchain_var_name=TOOLCHAIN_CXX_BINARY_$TOOLCHAIN_TYPE
1.936 + TOOLCHAIN_CXX_BINARY=${!toolchain_var_name}
1.937 +
1.938 +
1.939 + # Define filename patterns
1.940 + if test "x$OPENJDK_TARGET_OS" = xwindows; then
1.941 + LIBRARY_PREFIX=
1.942 + SHARED_LIBRARY_SUFFIX='.dll'
1.943 + STATIC_LIBRARY_SUFFIX='.lib'
1.944 + SHARED_LIBRARY='$1.dll'
1.945 + STATIC_LIBRARY='$1.lib'
1.946 + OBJ_SUFFIX='.obj'
1.947 + EXE_SUFFIX='.exe'
1.948 + else
1.949 + LIBRARY_PREFIX=lib
1.950 + SHARED_LIBRARY_SUFFIX='.so'
1.951 + STATIC_LIBRARY_SUFFIX='.a'
1.952 + SHARED_LIBRARY='lib$1.so'
1.953 + STATIC_LIBRARY='lib$1.a'
1.954 + OBJ_SUFFIX='.o'
1.955 + EXE_SUFFIX=''
1.956 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.957 + SHARED_LIBRARY='lib$1.dylib'
1.958 + SHARED_LIBRARY_SUFFIX='.dylib'
1.959 + fi
1.960 + fi
1.961 +
1.962 +
1.963 +
1.964 +
1.965 +
1.966 +
1.967 +
1.968 +
1.969 +
1.970 +
1.971 + if test "x$TOOLCHAIN_TYPE" = "x$DEFAULT_TOOLCHAIN"; then
1.972 + { $as_echo "$as_me:${as_lineno-$LINENO}: Using default toolchain $TOOLCHAIN_TYPE ($TOOLCHAIN_DESCRIPTION)" >&5
1.973 +$as_echo "$as_me: Using default toolchain $TOOLCHAIN_TYPE ($TOOLCHAIN_DESCRIPTION)" >&6;}
1.974 + else
1.975 + { $as_echo "$as_me:${as_lineno-$LINENO}: Using user selected toolchain $TOOLCHAIN_TYPE ($TOOLCHAIN_DESCRIPTION). Default toolchain is $DEFAULT_TOOLCHAIN." >&5
1.976 +$as_echo "$as_me: Using user selected toolchain $TOOLCHAIN_TYPE ($TOOLCHAIN_DESCRIPTION). Default toolchain is $DEFAULT_TOOLCHAIN." >&6;}
1.977 + fi
1.978 +
1.979 +
1.980 +# Then detect the actual binaries needed
1.981 +
1.982 + # FIXME: Is this needed?
1.983 ac_ext=cpp
1.984 ac_cpp='$CXXCPP $CPPFLAGS'
1.985 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.986 @@ -24665,384 +24923,151 @@
1.987 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1.988
1.989
1.990 - # The option used to specify the target .o,.a or .so file.
1.991 - # When compiling, how to specify the to be created object file.
1.992 - CC_OUT_OPTION='-o$(SPACE)'
1.993 - # When linking, how to specify the to be created executable.
1.994 - EXE_OUT_OPTION='-o$(SPACE)'
1.995 - # When linking, how to specify the to be created dynamically linkable library.
1.996 - LD_OUT_OPTION='-o$(SPACE)'
1.997 - # When archiving, how to specify the to be create static archive for object files.
1.998 - AR_OUT_OPTION='rcs$(SPACE)'
1.999 -
1.1000 -
1.1001 -
1.1002 -
1.1003 -
1.1004 -# Locate the actual tools
1.1005 -
1.1006 -
1.1007 -# Check whether --with-jtreg was given.
1.1008 -if test "${with_jtreg+set}" = set; then :
1.1009 - withval=$with_jtreg;
1.1010 -else
1.1011 - with_jtreg=no
1.1012 -fi
1.1013 -
1.1014 -
1.1015 - if test "x$with_jtreg" = xno; then
1.1016 - # jtreg disabled
1.1017 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jtreg" >&5
1.1018 -$as_echo_n "checking for jtreg... " >&6; }
1.1019 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.1020 -$as_echo "no" >&6; }
1.1021 - else
1.1022 - if test "x$with_jtreg" != xyes; then
1.1023 - # with path specified.
1.1024 - JT_HOME="$with_jtreg"
1.1025 - fi
1.1026 -
1.1027 - if test "x$JT_HOME" != x; then
1.1028 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jtreg" >&5
1.1029 -$as_echo_n "checking for jtreg... " >&6; }
1.1030 -
1.1031 - # use JT_HOME enviroment var.
1.1032 -
1.1033 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1034 -
1.1035 - # Input might be given as Windows format, start by converting to
1.1036 - # unix format.
1.1037 - path="$JT_HOME"
1.1038 - new_path=`$CYGPATH -u "$path"`
1.1039 -
1.1040 - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.1041 - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.1042 - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.1043 - # "foo.exe" is OK but "foo" is an error.
1.1044 - #
1.1045 - # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.1046 - # It is also a way to make sure we got the proper file name for the real test later on.
1.1047 - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.1048 - if test "x$test_shortpath" = x; then
1.1049 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of JT_HOME, which resolves as \"$path\", is invalid." >&5
1.1050 -$as_echo "$as_me: The path of JT_HOME, which resolves as \"$path\", is invalid." >&6;}
1.1051 - as_fn_error $? "Cannot locate the the path of JT_HOME" "$LINENO" 5
1.1052 - fi
1.1053 -
1.1054 - # Call helper function which possibly converts this using DOS-style short mode.
1.1055 - # If so, the updated path is stored in $new_path.
1.1056 -
1.1057 - input_path="$new_path"
1.1058 - # Check if we need to convert this using DOS-style short mode. If the path
1.1059 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.1060 - # take no chances and rewrite it.
1.1061 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.1062 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.1063 - if test "x$has_forbidden_chars" != x; then
1.1064 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.1065 - shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.1066 - path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.1067 - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.1068 - # Going to short mode and back again did indeed matter. Since short mode is
1.1069 - # case insensitive, let's make it lowercase to improve readability.
1.1070 - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1071 - # Now convert it back to Unix-stile (cygpath)
1.1072 - input_path=`$CYGPATH -u "$shortmode_path"`
1.1073 - new_path="$input_path"
1.1074 - fi
1.1075 - fi
1.1076 -
1.1077 - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.1078 - if test "x$test_cygdrive_prefix" = x; then
1.1079 - # As a simple fix, exclude /usr/bin since it's not a real path.
1.1080 - if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.1081 - # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.1082 - # a path prefixed by /cygdrive for fixpath to work.
1.1083 - new_path="$CYGWIN_ROOT_PATH$input_path"
1.1084 - fi
1.1085 - fi
1.1086 -
1.1087 -
1.1088 - if test "x$path" != "x$new_path"; then
1.1089 - JT_HOME="$new_path"
1.1090 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting JT_HOME to \"$new_path\"" >&5
1.1091 -$as_echo "$as_me: Rewriting JT_HOME to \"$new_path\"" >&6;}
1.1092 - fi
1.1093 -
1.1094 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1095 -
1.1096 - path="$JT_HOME"
1.1097 - has_colon=`$ECHO $path | $GREP ^.:`
1.1098 - new_path="$path"
1.1099 - if test "x$has_colon" = x; then
1.1100 - # Not in mixed or Windows style, start by that.
1.1101 - new_path=`cmd //c echo $path`
1.1102 - fi
1.1103 -
1.1104 -
1.1105 - input_path="$new_path"
1.1106 - # Check if we need to convert this using DOS-style short mode. If the path
1.1107 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.1108 - # take no chances and rewrite it.
1.1109 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.1110 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.1111 - if test "x$has_forbidden_chars" != x; then
1.1112 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.1113 - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1114 - fi
1.1115 -
1.1116 -
1.1117 - windows_path="$new_path"
1.1118 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1119 - unix_path=`$CYGPATH -u "$windows_path"`
1.1120 - new_path="$unix_path"
1.1121 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1122 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1123 - new_path="$unix_path"
1.1124 - fi
1.1125 -
1.1126 - if test "x$path" != "x$new_path"; then
1.1127 - JT_HOME="$new_path"
1.1128 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting JT_HOME to \"$new_path\"" >&5
1.1129 -$as_echo "$as_me: Rewriting JT_HOME to \"$new_path\"" >&6;}
1.1130 - fi
1.1131 -
1.1132 - # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.1133 - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.1134 -
1.1135 - else
1.1136 - # We're on a posix platform. Hooray! :)
1.1137 - path="$JT_HOME"
1.1138 - has_space=`$ECHO "$path" | $GREP " "`
1.1139 - if test "x$has_space" != x; then
1.1140 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of JT_HOME, which resolves as \"$path\", is invalid." >&5
1.1141 -$as_echo "$as_me: The path of JT_HOME, which resolves as \"$path\", is invalid." >&6;}
1.1142 - as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.1143 - fi
1.1144 -
1.1145 - # Use eval to expand a potential ~
1.1146 - eval path="$path"
1.1147 - if test ! -f "$path" && test ! -d "$path"; then
1.1148 - as_fn_error $? "The path of JT_HOME, which resolves as \"$path\", is not found." "$LINENO" 5
1.1149 - fi
1.1150 -
1.1151 - JT_HOME="`cd "$path"; $THEPWDCMD -L`"
1.1152 - fi
1.1153 -
1.1154 -
1.1155 - # jtreg win32 script works for everybody
1.1156 - JTREGEXE="$JT_HOME/bin/jtreg"
1.1157 -
1.1158 - if test ! -f "$JTREGEXE"; then
1.1159 - as_fn_error $? "JTReg executable does not exist: $JTREGEXE" "$LINENO" 5
1.1160 - fi
1.1161 -
1.1162 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
1.1163 -$as_echo "$JTREGEXE" >&6; }
1.1164 - else
1.1165 - # try to find jtreg on path
1.1166 -
1.1167 -
1.1168 -
1.1169 - # Publish this variable in the help.
1.1170 -
1.1171 -
1.1172 - if test "x$JTREGEXE" = x; then
1.1173 - # The variable is not set by user, try to locate tool using the code snippet
1.1174 - for ac_prog in jtreg
1.1175 -do
1.1176 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.1177 -set dummy $ac_prog; ac_word=$2
1.1178 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1179 -$as_echo_n "checking for $ac_word... " >&6; }
1.1180 -if ${ac_cv_path_JTREGEXE+:} false; then :
1.1181 - $as_echo_n "(cached) " >&6
1.1182 -else
1.1183 - case $JTREGEXE in
1.1184 - [\\/]* | ?:[\\/]*)
1.1185 - ac_cv_path_JTREGEXE="$JTREGEXE" # Let the user override the test with a path.
1.1186 - ;;
1.1187 - *)
1.1188 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.1189 -for as_dir in $PATH
1.1190 -do
1.1191 - IFS=$as_save_IFS
1.1192 - test -z "$as_dir" && as_dir=.
1.1193 - for ac_exec_ext in '' $ac_executable_extensions; do
1.1194 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1195 - ac_cv_path_JTREGEXE="$as_dir/$ac_word$ac_exec_ext"
1.1196 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1197 - break 2
1.1198 - fi
1.1199 -done
1.1200 - done
1.1201 -IFS=$as_save_IFS
1.1202 -
1.1203 - ;;
1.1204 -esac
1.1205 -fi
1.1206 -JTREGEXE=$ac_cv_path_JTREGEXE
1.1207 -if test -n "$JTREGEXE"; then
1.1208 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
1.1209 -$as_echo "$JTREGEXE" >&6; }
1.1210 -else
1.1211 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.1212 -$as_echo "no" >&6; }
1.1213 -fi
1.1214 -
1.1215 -
1.1216 - test -n "$JTREGEXE" && break
1.1217 -done
1.1218 -
1.1219 - else
1.1220 - # The variable is set, but is it from the command line or the environment?
1.1221 -
1.1222 - # Try to remove the string !JTREGEXE! from our list.
1.1223 - try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!JTREGEXE!/}
1.1224 - if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.1225 - # If it failed, the variable was not from the command line. Ignore it,
1.1226 - # but warn the user (except for BASH, which is always set by the calling BASH).
1.1227 - if test "xJTREGEXE" != xBASH; then
1.1228 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of JTREGEXE from the environment. Use command line variables instead." >&5
1.1229 -$as_echo "$as_me: WARNING: Ignoring value of JTREGEXE from the environment. Use command line variables instead." >&2;}
1.1230 - fi
1.1231 - # Try to locate tool using the code snippet
1.1232 - for ac_prog in jtreg
1.1233 -do
1.1234 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.1235 -set dummy $ac_prog; ac_word=$2
1.1236 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1237 -$as_echo_n "checking for $ac_word... " >&6; }
1.1238 -if ${ac_cv_path_JTREGEXE+:} false; then :
1.1239 - $as_echo_n "(cached) " >&6
1.1240 -else
1.1241 - case $JTREGEXE in
1.1242 - [\\/]* | ?:[\\/]*)
1.1243 - ac_cv_path_JTREGEXE="$JTREGEXE" # Let the user override the test with a path.
1.1244 - ;;
1.1245 - *)
1.1246 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.1247 -for as_dir in $PATH
1.1248 -do
1.1249 - IFS=$as_save_IFS
1.1250 - test -z "$as_dir" && as_dir=.
1.1251 - for ac_exec_ext in '' $ac_executable_extensions; do
1.1252 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1253 - ac_cv_path_JTREGEXE="$as_dir/$ac_word$ac_exec_ext"
1.1254 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1255 - break 2
1.1256 - fi
1.1257 -done
1.1258 - done
1.1259 -IFS=$as_save_IFS
1.1260 -
1.1261 - ;;
1.1262 -esac
1.1263 -fi
1.1264 -JTREGEXE=$ac_cv_path_JTREGEXE
1.1265 -if test -n "$JTREGEXE"; then
1.1266 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
1.1267 -$as_echo "$JTREGEXE" >&6; }
1.1268 -else
1.1269 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.1270 -$as_echo "no" >&6; }
1.1271 -fi
1.1272 -
1.1273 -
1.1274 - test -n "$JTREGEXE" && break
1.1275 -done
1.1276 -
1.1277 - else
1.1278 - # If it succeeded, then it was overridden by the user. We will use it
1.1279 - # for the tool.
1.1280 -
1.1281 - # First remove it from the list of overridden variables, so we can test
1.1282 - # for unknown variables in the end.
1.1283 - CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.1284 -
1.1285 - # Check if the provided tool contains a complete path.
1.1286 - tool_specified="$JTREGEXE"
1.1287 - tool_basename="${tool_specified##*/}"
1.1288 - if test "x$tool_basename" = "x$tool_specified"; then
1.1289 - # A command without a complete path is provided, search $PATH.
1.1290 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool JTREGEXE=$tool_basename" >&5
1.1291 -$as_echo "$as_me: Will search for user supplied tool JTREGEXE=$tool_basename" >&6;}
1.1292 - # Extract the first word of "$tool_basename", so it can be a program name with args.
1.1293 -set dummy $tool_basename; ac_word=$2
1.1294 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1295 -$as_echo_n "checking for $ac_word... " >&6; }
1.1296 -if ${ac_cv_path_JTREGEXE+:} false; then :
1.1297 - $as_echo_n "(cached) " >&6
1.1298 -else
1.1299 - case $JTREGEXE in
1.1300 - [\\/]* | ?:[\\/]*)
1.1301 - ac_cv_path_JTREGEXE="$JTREGEXE" # Let the user override the test with a path.
1.1302 - ;;
1.1303 - *)
1.1304 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.1305 -for as_dir in $PATH
1.1306 -do
1.1307 - IFS=$as_save_IFS
1.1308 - test -z "$as_dir" && as_dir=.
1.1309 - for ac_exec_ext in '' $ac_executable_extensions; do
1.1310 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1311 - ac_cv_path_JTREGEXE="$as_dir/$ac_word$ac_exec_ext"
1.1312 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1313 - break 2
1.1314 - fi
1.1315 -done
1.1316 - done
1.1317 -IFS=$as_save_IFS
1.1318 -
1.1319 - ;;
1.1320 -esac
1.1321 -fi
1.1322 -JTREGEXE=$ac_cv_path_JTREGEXE
1.1323 -if test -n "$JTREGEXE"; then
1.1324 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
1.1325 -$as_echo "$JTREGEXE" >&6; }
1.1326 -else
1.1327 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.1328 -$as_echo "no" >&6; }
1.1329 -fi
1.1330 -
1.1331 -
1.1332 - if test "x$JTREGEXE" = x; then
1.1333 - as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.1334 - fi
1.1335 - else
1.1336 - # Otherwise we believe it is a complete path. Use it as it is.
1.1337 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool JTREGEXE=$tool_specified" >&5
1.1338 -$as_echo "$as_me: Will use user supplied tool JTREGEXE=$tool_specified" >&6;}
1.1339 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JTREGEXE" >&5
1.1340 -$as_echo_n "checking for JTREGEXE... " >&6; }
1.1341 - if test ! -x "$tool_specified"; then
1.1342 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.1343 -$as_echo "not found" >&6; }
1.1344 - as_fn_error $? "User supplied tool JTREGEXE=$tool_specified does not exist or is not executable" "$LINENO" 5
1.1345 - fi
1.1346 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.1347 -$as_echo "$tool_specified" >&6; }
1.1348 - fi
1.1349 - fi
1.1350 - fi
1.1351 -
1.1352 -
1.1353 -
1.1354 - if test "x$JTREGEXE" = x; then
1.1355 - as_fn_error $? "Could not find required tool for JTREGEXE" "$LINENO" 5
1.1356 - fi
1.1357 -
1.1358 -
1.1359 - JT_HOME="`$DIRNAME $JTREGEXE`"
1.1360 - fi
1.1361 - fi
1.1362 -
1.1363 -
1.1364 -
1.1365 -
1.1366 -
1.1367 - if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.1368 + # Store the CFLAGS etal passed to the configure script.
1.1369 + ORG_CFLAGS="$CFLAGS"
1.1370 + ORG_CXXFLAGS="$CXXFLAGS"
1.1371 + ORG_OBJCFLAGS="$OBJCFLAGS"
1.1372 +
1.1373 + # autoconf magic only relies on PATH, so update it if tools dir is specified
1.1374 + OLD_PATH="$PATH"
1.1375 +
1.1376 + # Before we locate the compilers, we need to sanitize the Xcode build environment
1.1377 + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.1378 + # determine path to Xcode developer directory
1.1379 + # can be empty in which case all the tools will rely on a sane Xcode 4 installation
1.1380 + SET_DEVELOPER_DIR=
1.1381 +
1.1382 + if test -n "$XCODE_PATH"; then
1.1383 + DEVELOPER_DIR="$XCODE_PATH"/Contents/Developer
1.1384 + fi
1.1385 +
1.1386 + # DEVELOPER_DIR could also be provided directly
1.1387 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Determining if we need to set DEVELOPER_DIR" >&5
1.1388 +$as_echo_n "checking Determining if we need to set DEVELOPER_DIR... " >&6; }
1.1389 + if test -n "$DEVELOPER_DIR"; then
1.1390 + if test ! -d "$DEVELOPER_DIR"; then
1.1391 + as_fn_error $? "Xcode Developer path does not exist: $DEVELOPER_DIR, please provide a path to the Xcode 4 application bundle using --with-xcode-path" "$LINENO" 5
1.1392 + fi
1.1393 + if test ! -f "$DEVELOPER_DIR"/usr/bin/xcodebuild; then
1.1394 + as_fn_error $? "Xcode Developer path is not valid: $DEVELOPER_DIR, it must point to Contents/Developer inside an Xcode application bundle" "$LINENO" 5
1.1395 + fi
1.1396 + # make it visible to all the tools immediately
1.1397 + export DEVELOPER_DIR
1.1398 + SET_DEVELOPER_DIR="export DEVELOPER_DIR := $DEVELOPER_DIR"
1.1399 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($DEVELOPER_DIR)" >&5
1.1400 +$as_echo "yes ($DEVELOPER_DIR)" >&6; }
1.1401 + else
1.1402 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.1403 +$as_echo "no" >&6; }
1.1404 + fi
1.1405 +
1.1406 +
1.1407 + # Extract the first word of "xcodebuild", so it can be a program name with args.
1.1408 +set dummy xcodebuild; ac_word=$2
1.1409 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1410 +$as_echo_n "checking for $ac_word... " >&6; }
1.1411 +if ${ac_cv_path_XCODEBUILD+:} false; then :
1.1412 + $as_echo_n "(cached) " >&6
1.1413 +else
1.1414 + case $XCODEBUILD in
1.1415 + [\\/]* | ?:[\\/]*)
1.1416 + ac_cv_path_XCODEBUILD="$XCODEBUILD" # Let the user override the test with a path.
1.1417 + ;;
1.1418 + *)
1.1419 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.1420 +for as_dir in $PATH
1.1421 +do
1.1422 + IFS=$as_save_IFS
1.1423 + test -z "$as_dir" && as_dir=.
1.1424 + for ac_exec_ext in '' $ac_executable_extensions; do
1.1425 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1426 + ac_cv_path_XCODEBUILD="$as_dir/$ac_word$ac_exec_ext"
1.1427 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1428 + break 2
1.1429 + fi
1.1430 +done
1.1431 + done
1.1432 +IFS=$as_save_IFS
1.1433 +
1.1434 + ;;
1.1435 +esac
1.1436 +fi
1.1437 +XCODEBUILD=$ac_cv_path_XCODEBUILD
1.1438 +if test -n "$XCODEBUILD"; then
1.1439 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XCODEBUILD" >&5
1.1440 +$as_echo "$XCODEBUILD" >&6; }
1.1441 +else
1.1442 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.1443 +$as_echo "no" >&6; }
1.1444 +fi
1.1445 +
1.1446 +
1.1447 + if test -z "$XCODEBUILD"; then
1.1448 + as_fn_error $? "The xcodebuild tool was not found, the Xcode command line tools are required to build on Mac OS X" "$LINENO" 5
1.1449 + fi
1.1450 +
1.1451 + # Fail-fast: verify we're building on Xcode 4, we cannot build with Xcode 5 or later
1.1452 + XCODE_VERSION=`$XCODEBUILD -version | grep '^Xcode ' | sed 's/Xcode //'`
1.1453 + XC_VERSION_PARTS=( ${XCODE_VERSION//./ } )
1.1454 + if test ! "${XC_VERSION_PARTS[0]}" = "4"; then
1.1455 + as_fn_error $? "Xcode 4 is required to build JDK 8, the version found was $XCODE_VERSION. Use --with-xcode-path to specify the location of Xcode 4 or make Xcode 4 active by using xcode-select." "$LINENO" 5
1.1456 + fi
1.1457 +
1.1458 + # Some versions of Xcode 5 command line tools install gcc and g++ as symlinks to
1.1459 + # clang and clang++, which will break the build. So handle that here if we need to.
1.1460 + if test -L "/usr/bin/gcc" -o -L "/usr/bin/g++"; then
1.1461 + # use xcrun to find the real gcc and add it's directory to PATH
1.1462 + # then autoconf magic will find it
1.1463 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found gcc symlinks to clang in /usr/bin, adding path to real gcc to PATH" >&5
1.1464 +$as_echo "$as_me: Found gcc symlinks to clang in /usr/bin, adding path to real gcc to PATH" >&6;}
1.1465 + XCODE_BIN_PATH=$(dirname `xcrun -find gcc`)
1.1466 + PATH="$XCODE_BIN_PATH":$PATH
1.1467 + fi
1.1468 +
1.1469 + # Determine appropriate SDKPATH, don't use SDKROOT as it interferes with the stub tools
1.1470 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Determining Xcode SDK path" >&5
1.1471 +$as_echo_n "checking Determining Xcode SDK path... " >&6; }
1.1472 + # allow SDKNAME to be set to override the default SDK selection
1.1473 + SDKPATH=`"$XCODEBUILD" -sdk ${SDKNAME:-macosx} -version | grep '^Path: ' | sed 's/Path: //'`
1.1474 + if test -n "$SDKPATH"; then
1.1475 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDKPATH" >&5
1.1476 +$as_echo "$SDKPATH" >&6; }
1.1477 + else
1.1478 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: (none, will use system headers and frameworks)" >&5
1.1479 +$as_echo "(none, will use system headers and frameworks)" >&6; }
1.1480 + fi
1.1481 +
1.1482 +
1.1483 + # Perform a basic sanity test
1.1484 + if test ! -f "$SDKPATH/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h"; then
1.1485 + as_fn_error $? "Unable to find required framework headers, provide a valid path to Xcode 4 using --with-xcode-path" "$LINENO" 5
1.1486 + fi
1.1487 +
1.1488 + # if SDKPATH is non-empty then we need to add -isysroot and -iframework for gcc and g++
1.1489 + if test -n "$SDKPATH"; then
1.1490 + # We need -isysroot <path> and -iframework<path>/System/Library/Frameworks
1.1491 + CFLAGS_JDK="${CFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\""
1.1492 + CXXFLAGS_JDK="${CXXFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\""
1.1493 + LDFLAGS_JDK="${LDFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\""
1.1494 + fi
1.1495 +
1.1496 + # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework
1.1497 + # setting this here means it doesn't have to be peppered throughout the forest
1.1498 + CFLAGS_JDK="$CFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
1.1499 + CXXFLAGS_JDK="$CXXFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
1.1500 + LDFLAGS_JDK="$LDFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
1.1501 + fi
1.1502 +
1.1503 + # For solaris we really need solaris tools, and not the GNU equivalent.
1.1504 + # The build tools on Solaris reside in /usr/ccs (C Compilation System),
1.1505 + # so add that to path before starting to probe.
1.1506 + # FIXME: This was originally only done for AS,NM,GNM,STRIP,MCS,OBJCOPY,OBJDUMP.
1.1507 + if test "x$OPENJDK_BUILD_OS" = xsolaris; then
1.1508 + PATH="/usr/ccs/bin:$PATH"
1.1509 + fi
1.1510 +
1.1511 + # On Windows, we need to detect the visual studio installation first.
1.1512 + if test "x$OPENJDK_BUILD_OS" = "xwindows" && test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then
1.1513
1.1514 # Store path to cygwin link.exe to help excluding it when searching for
1.1515 # VS linker. This must be done before changing the PATH when looking for VS.
1.1516 @@ -25714,8 +25739,7 @@
1.1517 done
1.1518 IFS="$IFS_save"
1.1519 else
1.1520 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving VS_ENV_CMD (as $path) failed, using $path directly." >&5
1.1521 -$as_echo "$as_me: Resolving VS_ENV_CMD (as $path) failed, using $path directly." >&6;}
1.1522 + # This is an absolute path, we can use it without further modifications.
1.1523 new_path="$path"
1.1524 fi
1.1525
1.1526 @@ -25851,1834 +25875,13 @@
1.1527 as_fn_error $? "Cannot continue" "$LINENO" 5
1.1528 fi
1.1529
1.1530 -
1.1531 -
1.1532 -# Check whether --with-msvcr-dll was given.
1.1533 -if test "${with_msvcr_dll+set}" = set; then :
1.1534 - withval=$with_msvcr_dll;
1.1535 -fi
1.1536 -
1.1537 -
1.1538 - if test "x$with_msvcr_dll" != x; then
1.1539 - # If given explicitely by user, do not probe. If not present, fail directly.
1.1540 -
1.1541 - POSSIBLE_MSVCR_DLL="$with_msvcr_dll"
1.1542 - METHOD="--with-msvcr-dll"
1.1543 - if test -e "$POSSIBLE_MSVCR_DLL"; then
1.1544 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
1.1545 -$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
1.1546 -
1.1547 - # Need to check if the found msvcr is correct architecture
1.1548 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.1549 -$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.1550 - MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.1551 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1552 - CORRECT_MSVCR_ARCH=386
1.1553 - else
1.1554 - CORRECT_MSVCR_ARCH=x86-64
1.1555 - fi
1.1556 - if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.1557 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.1558 -$as_echo "ok" >&6; }
1.1559 - MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.1560 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.1561 -$as_echo_n "checking for msvcr100.dll... " >&6; }
1.1562 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
1.1563 -$as_echo "$MSVCR_DLL" >&6; }
1.1564 - else
1.1565 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.1566 -$as_echo "incorrect, ignoring" >&6; }
1.1567 - { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
1.1568 -$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
1.1569 - fi
1.1570 - fi
1.1571 -
1.1572 - if test "x$MSVCR_DLL" = x; then
1.1573 - as_fn_error $? "Could not find a proper msvcr100.dll as specified by --with-msvcr-dll" "$LINENO" 5
1.1574 - fi
1.1575 - fi
1.1576 -
1.1577 - if test "x$MSVCR_DLL" = x; then
1.1578 - # Probe: Using well-known location from Visual Studio 10.0
1.1579 - if test "x$VCINSTALLDIR" != x; then
1.1580 - CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR"
1.1581 -
1.1582 - windows_path="$CYGWIN_VC_INSTALL_DIR"
1.1583 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1584 - unix_path=`$CYGPATH -u "$windows_path"`
1.1585 - CYGWIN_VC_INSTALL_DIR="$unix_path"
1.1586 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1587 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1588 - CYGWIN_VC_INSTALL_DIR="$unix_path"
1.1589 - fi
1.1590 -
1.1591 - if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.1592 - POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC100.CRT/msvcr100.dll"
1.1593 - else
1.1594 - POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC100.CRT/msvcr100.dll"
1.1595 - fi
1.1596 -
1.1597 - POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.1598 - METHOD="well-known location in VCINSTALLDIR"
1.1599 - if test -e "$POSSIBLE_MSVCR_DLL"; then
1.1600 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
1.1601 -$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
1.1602 -
1.1603 - # Need to check if the found msvcr is correct architecture
1.1604 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.1605 -$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.1606 - MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.1607 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1608 - CORRECT_MSVCR_ARCH=386
1.1609 - else
1.1610 - CORRECT_MSVCR_ARCH=x86-64
1.1611 - fi
1.1612 - if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.1613 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.1614 -$as_echo "ok" >&6; }
1.1615 - MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.1616 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.1617 -$as_echo_n "checking for msvcr100.dll... " >&6; }
1.1618 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
1.1619 -$as_echo "$MSVCR_DLL" >&6; }
1.1620 - else
1.1621 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.1622 -$as_echo "incorrect, ignoring" >&6; }
1.1623 - { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
1.1624 -$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
1.1625 - fi
1.1626 - fi
1.1627 -
1.1628 - fi
1.1629 - fi
1.1630 -
1.1631 - if test "x$MSVCR_DLL" = x; then
1.1632 - # Probe: Check in the Boot JDK directory.
1.1633 - POSSIBLE_MSVCR_DLL="$BOOT_JDK/bin/msvcr100.dll"
1.1634 -
1.1635 - POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.1636 - METHOD="well-known location in Boot JDK"
1.1637 - if test -e "$POSSIBLE_MSVCR_DLL"; then
1.1638 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
1.1639 -$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
1.1640 -
1.1641 - # Need to check if the found msvcr is correct architecture
1.1642 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.1643 -$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.1644 - MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.1645 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1646 - CORRECT_MSVCR_ARCH=386
1.1647 - else
1.1648 - CORRECT_MSVCR_ARCH=x86-64
1.1649 - fi
1.1650 - if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.1651 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.1652 -$as_echo "ok" >&6; }
1.1653 - MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.1654 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.1655 -$as_echo_n "checking for msvcr100.dll... " >&6; }
1.1656 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
1.1657 -$as_echo "$MSVCR_DLL" >&6; }
1.1658 - else
1.1659 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.1660 -$as_echo "incorrect, ignoring" >&6; }
1.1661 - { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
1.1662 -$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
1.1663 - fi
1.1664 - fi
1.1665 -
1.1666 - fi
1.1667 -
1.1668 - if test "x$MSVCR_DLL" = x; then
1.1669 - # Probe: Look in the Windows system32 directory
1.1670 - CYGWIN_SYSTEMROOT="$SYSTEMROOT"
1.1671 -
1.1672 - windows_path="$CYGWIN_SYSTEMROOT"
1.1673 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1674 - unix_path=`$CYGPATH -u "$windows_path"`
1.1675 - CYGWIN_SYSTEMROOT="$unix_path"
1.1676 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1677 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1678 - CYGWIN_SYSTEMROOT="$unix_path"
1.1679 - fi
1.1680 -
1.1681 - POSSIBLE_MSVCR_DLL="$CYGWIN_SYSTEMROOT/system32/msvcr100.dll"
1.1682 -
1.1683 - POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.1684 - METHOD="well-known location in SYSTEMROOT"
1.1685 - if test -e "$POSSIBLE_MSVCR_DLL"; then
1.1686 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
1.1687 -$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
1.1688 -
1.1689 - # Need to check if the found msvcr is correct architecture
1.1690 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.1691 -$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.1692 - MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.1693 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1694 - CORRECT_MSVCR_ARCH=386
1.1695 - else
1.1696 - CORRECT_MSVCR_ARCH=x86-64
1.1697 - fi
1.1698 - if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.1699 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.1700 -$as_echo "ok" >&6; }
1.1701 - MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.1702 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.1703 -$as_echo_n "checking for msvcr100.dll... " >&6; }
1.1704 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
1.1705 -$as_echo "$MSVCR_DLL" >&6; }
1.1706 - else
1.1707 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.1708 -$as_echo "incorrect, ignoring" >&6; }
1.1709 - { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
1.1710 -$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
1.1711 - fi
1.1712 - fi
1.1713 -
1.1714 - fi
1.1715 -
1.1716 - if test "x$MSVCR_DLL" = x; then
1.1717 - # Probe: If Visual Studio Express is installed, there is usually one with the debugger
1.1718 - if test "x$VS100COMNTOOLS" != x; then
1.1719 - CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
1.1720 -
1.1721 - windows_path="$CYGWIN_VS_TOOLS_DIR"
1.1722 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1723 - unix_path=`$CYGPATH -u "$windows_path"`
1.1724 - CYGWIN_VS_TOOLS_DIR="$unix_path"
1.1725 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1726 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1727 - CYGWIN_VS_TOOLS_DIR="$unix_path"
1.1728 - fi
1.1729 -
1.1730 - if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.1731 - POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x64/ | $HEAD --lines 1`
1.1732 - else
1.1733 - POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x86/ | $HEAD --lines 1`
1.1734 - fi
1.1735 -
1.1736 - POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.1737 - METHOD="search of VS100COMNTOOLS"
1.1738 - if test -e "$POSSIBLE_MSVCR_DLL"; then
1.1739 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
1.1740 -$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
1.1741 -
1.1742 - # Need to check if the found msvcr is correct architecture
1.1743 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.1744 -$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.1745 - MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.1746 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1747 - CORRECT_MSVCR_ARCH=386
1.1748 - else
1.1749 - CORRECT_MSVCR_ARCH=x86-64
1.1750 - fi
1.1751 - if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.1752 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.1753 -$as_echo "ok" >&6; }
1.1754 - MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.1755 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.1756 -$as_echo_n "checking for msvcr100.dll... " >&6; }
1.1757 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
1.1758 -$as_echo "$MSVCR_DLL" >&6; }
1.1759 - else
1.1760 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.1761 -$as_echo "incorrect, ignoring" >&6; }
1.1762 - { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
1.1763 -$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
1.1764 - fi
1.1765 - fi
1.1766 -
1.1767 - fi
1.1768 - fi
1.1769 -
1.1770 - if test "x$MSVCR_DLL" = x; then
1.1771 - # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now.
1.1772 - # (This was the original behaviour; kept since it might turn up something)
1.1773 - if test "x$CYGWIN_VC_INSTALL_DIR" != x; then
1.1774 - if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.1775 - POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x64 | $HEAD --lines 1`
1.1776 - else
1.1777 - POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
1.1778 - if test "x$POSSIBLE_MSVCR_DLL" = x; then
1.1779 - # We're grasping at straws now...
1.1780 - POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $HEAD --lines 1`
1.1781 - fi
1.1782 - fi
1.1783 -
1.1784 -
1.1785 - POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.1786 - METHOD="search of VCINSTALLDIR"
1.1787 - if test -e "$POSSIBLE_MSVCR_DLL"; then
1.1788 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
1.1789 -$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
1.1790 -
1.1791 - # Need to check if the found msvcr is correct architecture
1.1792 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.1793 -$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.1794 - MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.1795 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1796 - CORRECT_MSVCR_ARCH=386
1.1797 - else
1.1798 - CORRECT_MSVCR_ARCH=x86-64
1.1799 - fi
1.1800 - if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.1801 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.1802 -$as_echo "ok" >&6; }
1.1803 - MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.1804 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.1805 -$as_echo_n "checking for msvcr100.dll... " >&6; }
1.1806 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
1.1807 -$as_echo "$MSVCR_DLL" >&6; }
1.1808 - else
1.1809 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.1810 -$as_echo "incorrect, ignoring" >&6; }
1.1811 - { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
1.1812 -$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
1.1813 - fi
1.1814 - fi
1.1815 -
1.1816 - fi
1.1817 - fi
1.1818 -
1.1819 - if test "x$MSVCR_DLL" = x; then
1.1820 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.1821 -$as_echo_n "checking for msvcr100.dll... " >&6; }
1.1822 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.1823 -$as_echo "no" >&6; }
1.1824 - as_fn_error $? "Could not find msvcr100.dll. Please specify using --with-msvcr-dll." "$LINENO" 5
1.1825 - fi
1.1826 -
1.1827 -
1.1828 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1829 -
1.1830 - # Input might be given as Windows format, start by converting to
1.1831 - # unix format.
1.1832 - path="$MSVCR_DLL"
1.1833 - new_path=`$CYGPATH -u "$path"`
1.1834 -
1.1835 - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.1836 - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.1837 - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.1838 - # "foo.exe" is OK but "foo" is an error.
1.1839 - #
1.1840 - # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.1841 - # It is also a way to make sure we got the proper file name for the real test later on.
1.1842 - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.1843 - if test "x$test_shortpath" = x; then
1.1844 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&5
1.1845 -$as_echo "$as_me: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&6;}
1.1846 - as_fn_error $? "Cannot locate the the path of MSVCR_DLL" "$LINENO" 5
1.1847 - fi
1.1848 -
1.1849 - # Call helper function which possibly converts this using DOS-style short mode.
1.1850 - # If so, the updated path is stored in $new_path.
1.1851 -
1.1852 - input_path="$new_path"
1.1853 - # Check if we need to convert this using DOS-style short mode. If the path
1.1854 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.1855 - # take no chances and rewrite it.
1.1856 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.1857 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.1858 - if test "x$has_forbidden_chars" != x; then
1.1859 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.1860 - shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.1861 - path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.1862 - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.1863 - # Going to short mode and back again did indeed matter. Since short mode is
1.1864 - # case insensitive, let's make it lowercase to improve readability.
1.1865 - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1866 - # Now convert it back to Unix-stile (cygpath)
1.1867 - input_path=`$CYGPATH -u "$shortmode_path"`
1.1868 - new_path="$input_path"
1.1869 - fi
1.1870 - fi
1.1871 -
1.1872 - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.1873 - if test "x$test_cygdrive_prefix" = x; then
1.1874 - # As a simple fix, exclude /usr/bin since it's not a real path.
1.1875 - if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.1876 - # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.1877 - # a path prefixed by /cygdrive for fixpath to work.
1.1878 - new_path="$CYGWIN_ROOT_PATH$input_path"
1.1879 - fi
1.1880 - fi
1.1881 -
1.1882 -
1.1883 - if test "x$path" != "x$new_path"; then
1.1884 - MSVCR_DLL="$new_path"
1.1885 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVCR_DLL to \"$new_path\"" >&5
1.1886 -$as_echo "$as_me: Rewriting MSVCR_DLL to \"$new_path\"" >&6;}
1.1887 - fi
1.1888 -
1.1889 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1890 -
1.1891 - path="$MSVCR_DLL"
1.1892 - has_colon=`$ECHO $path | $GREP ^.:`
1.1893 - new_path="$path"
1.1894 - if test "x$has_colon" = x; then
1.1895 - # Not in mixed or Windows style, start by that.
1.1896 - new_path=`cmd //c echo $path`
1.1897 - fi
1.1898 -
1.1899 -
1.1900 - input_path="$new_path"
1.1901 - # Check if we need to convert this using DOS-style short mode. If the path
1.1902 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.1903 - # take no chances and rewrite it.
1.1904 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.1905 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.1906 - if test "x$has_forbidden_chars" != x; then
1.1907 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.1908 - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1909 - fi
1.1910 -
1.1911 -
1.1912 - windows_path="$new_path"
1.1913 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1914 - unix_path=`$CYGPATH -u "$windows_path"`
1.1915 - new_path="$unix_path"
1.1916 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1917 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1918 - new_path="$unix_path"
1.1919 - fi
1.1920 -
1.1921 - if test "x$path" != "x$new_path"; then
1.1922 - MSVCR_DLL="$new_path"
1.1923 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVCR_DLL to \"$new_path\"" >&5
1.1924 -$as_echo "$as_me: Rewriting MSVCR_DLL to \"$new_path\"" >&6;}
1.1925 - fi
1.1926 -
1.1927 - # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.1928 - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.1929 -
1.1930 - else
1.1931 - # We're on a posix platform. Hooray! :)
1.1932 - path="$MSVCR_DLL"
1.1933 - has_space=`$ECHO "$path" | $GREP " "`
1.1934 - if test "x$has_space" != x; then
1.1935 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&5
1.1936 -$as_echo "$as_me: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&6;}
1.1937 - as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.1938 - fi
1.1939 -
1.1940 - # Use eval to expand a potential ~
1.1941 - eval path="$path"
1.1942 - if test ! -f "$path" && test ! -d "$path"; then
1.1943 - as_fn_error $? "The path of MSVCR_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.1944 - fi
1.1945 -
1.1946 - MSVCR_DLL="`cd "$path"; $THEPWDCMD -L`"
1.1947 - fi
1.1948 -
1.1949 -
1.1950 -
1.1951 -
1.1952 -# Check whether --with-dxsdk was given.
1.1953 -if test "${with_dxsdk+set}" = set; then :
1.1954 - withval=$with_dxsdk; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-dxsdk is deprecated and will be ignored." >&5
1.1955 -$as_echo "$as_me: WARNING: Option --with-dxsdk is deprecated and will be ignored." >&2;}
1.1956 -fi
1.1957 -
1.1958 -
1.1959 -
1.1960 -
1.1961 -# Check whether --with-dxsdk-lib was given.
1.1962 -if test "${with_dxsdk_lib+set}" = set; then :
1.1963 - withval=$with_dxsdk_lib; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-dxsdk-lib is deprecated and will be ignored." >&5
1.1964 -$as_echo "$as_me: WARNING: Option --with-dxsdk-lib is deprecated and will be ignored." >&2;}
1.1965 -fi
1.1966 -
1.1967 -
1.1968 -
1.1969 -
1.1970 -# Check whether --with-dxsdk-include was given.
1.1971 -if test "${with_dxsdk_include+set}" = set; then :
1.1972 - withval=$with_dxsdk_include; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-dxsdk-include is deprecated and will be ignored." >&5
1.1973 -$as_echo "$as_me: WARNING: Option --with-dxsdk-include is deprecated and will be ignored." >&2;}
1.1974 -fi
1.1975 -
1.1976 -
1.1977 - fi
1.1978 -
1.1979 -
1.1980 -
1.1981 - # If --build AND --host is set, then the configure script will find any
1.1982 - # cross compilation tools in the PATH. Cross compilation tools
1.1983 - # follows the cross compilation standard where they are prefixed with ${host}.
1.1984 - # For example the binary i686-sun-solaris2.10-gcc
1.1985 - # will cross compile for i686-sun-solaris2.10
1.1986 - # If neither of build and host is not set, then build=host and the
1.1987 - # default compiler found in the path will be used.
1.1988 - # Setting only --host, does not seem to be really supported.
1.1989 - # Please set both --build and --host if you want to cross compile.
1.1990 -
1.1991 - if test "x$COMPILE_TYPE" = "xcross"; then
1.1992 - # Now we to find a C/C++ compiler that can build executables for the build
1.1993 - # platform. We can't use the AC_PROG_CC macro, since it can only be used
1.1994 - # once. Also, we need to do this before adding a tools dir to the path,
1.1995 - # otherwise we might pick up cross-compilers which don't use standard naming.
1.1996 - # Otherwise, we'll set the BUILD_tools to the native tools, but that'll have
1.1997 - # to wait until they are properly discovered.
1.1998 -
1.1999 -
1.2000 - # Publish this variable in the help.
1.2001 -
1.2002 -
1.2003 - if test "x$BUILD_CC" = x; then
1.2004 - # The variable is not set by user, try to locate tool using the code snippet
1.2005 - for ac_prog in cl cc gcc
1.2006 -do
1.2007 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.2008 -set dummy $ac_prog; ac_word=$2
1.2009 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2010 -$as_echo_n "checking for $ac_word... " >&6; }
1.2011 -if ${ac_cv_path_BUILD_CC+:} false; then :
1.2012 - $as_echo_n "(cached) " >&6
1.2013 -else
1.2014 - case $BUILD_CC in
1.2015 - [\\/]* | ?:[\\/]*)
1.2016 - ac_cv_path_BUILD_CC="$BUILD_CC" # Let the user override the test with a path.
1.2017 - ;;
1.2018 - *)
1.2019 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.2020 -for as_dir in $PATH
1.2021 -do
1.2022 - IFS=$as_save_IFS
1.2023 - test -z "$as_dir" && as_dir=.
1.2024 - for ac_exec_ext in '' $ac_executable_extensions; do
1.2025 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2026 - ac_cv_path_BUILD_CC="$as_dir/$ac_word$ac_exec_ext"
1.2027 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2028 - break 2
1.2029 - fi
1.2030 -done
1.2031 - done
1.2032 -IFS=$as_save_IFS
1.2033 -
1.2034 - ;;
1.2035 -esac
1.2036 -fi
1.2037 -BUILD_CC=$ac_cv_path_BUILD_CC
1.2038 -if test -n "$BUILD_CC"; then
1.2039 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
1.2040 -$as_echo "$BUILD_CC" >&6; }
1.2041 -else
1.2042 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.2043 -$as_echo "no" >&6; }
1.2044 -fi
1.2045 -
1.2046 -
1.2047 - test -n "$BUILD_CC" && break
1.2048 -done
1.2049 -
1.2050 - else
1.2051 - # The variable is set, but is it from the command line or the environment?
1.2052 -
1.2053 - # Try to remove the string !BUILD_CC! from our list.
1.2054 - try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!BUILD_CC!/}
1.2055 - if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.2056 - # If it failed, the variable was not from the command line. Ignore it,
1.2057 - # but warn the user (except for BASH, which is always set by the calling BASH).
1.2058 - if test "xBUILD_CC" != xBASH; then
1.2059 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of BUILD_CC from the environment. Use command line variables instead." >&5
1.2060 -$as_echo "$as_me: WARNING: Ignoring value of BUILD_CC from the environment. Use command line variables instead." >&2;}
1.2061 - fi
1.2062 - # Try to locate tool using the code snippet
1.2063 - for ac_prog in cl cc gcc
1.2064 -do
1.2065 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.2066 -set dummy $ac_prog; ac_word=$2
1.2067 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2068 -$as_echo_n "checking for $ac_word... " >&6; }
1.2069 -if ${ac_cv_path_BUILD_CC+:} false; then :
1.2070 - $as_echo_n "(cached) " >&6
1.2071 -else
1.2072 - case $BUILD_CC in
1.2073 - [\\/]* | ?:[\\/]*)
1.2074 - ac_cv_path_BUILD_CC="$BUILD_CC" # Let the user override the test with a path.
1.2075 - ;;
1.2076 - *)
1.2077 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.2078 -for as_dir in $PATH
1.2079 -do
1.2080 - IFS=$as_save_IFS
1.2081 - test -z "$as_dir" && as_dir=.
1.2082 - for ac_exec_ext in '' $ac_executable_extensions; do
1.2083 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2084 - ac_cv_path_BUILD_CC="$as_dir/$ac_word$ac_exec_ext"
1.2085 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2086 - break 2
1.2087 - fi
1.2088 -done
1.2089 - done
1.2090 -IFS=$as_save_IFS
1.2091 -
1.2092 - ;;
1.2093 -esac
1.2094 -fi
1.2095 -BUILD_CC=$ac_cv_path_BUILD_CC
1.2096 -if test -n "$BUILD_CC"; then
1.2097 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
1.2098 -$as_echo "$BUILD_CC" >&6; }
1.2099 -else
1.2100 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.2101 -$as_echo "no" >&6; }
1.2102 -fi
1.2103 -
1.2104 -
1.2105 - test -n "$BUILD_CC" && break
1.2106 -done
1.2107 -
1.2108 - else
1.2109 - # If it succeeded, then it was overridden by the user. We will use it
1.2110 - # for the tool.
1.2111 -
1.2112 - # First remove it from the list of overridden variables, so we can test
1.2113 - # for unknown variables in the end.
1.2114 - CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.2115 -
1.2116 - # Check if the provided tool contains a complete path.
1.2117 - tool_specified="$BUILD_CC"
1.2118 - tool_basename="${tool_specified##*/}"
1.2119 - if test "x$tool_basename" = "x$tool_specified"; then
1.2120 - # A command without a complete path is provided, search $PATH.
1.2121 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool BUILD_CC=$tool_basename" >&5
1.2122 -$as_echo "$as_me: Will search for user supplied tool BUILD_CC=$tool_basename" >&6;}
1.2123 - # Extract the first word of "$tool_basename", so it can be a program name with args.
1.2124 -set dummy $tool_basename; ac_word=$2
1.2125 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2126 -$as_echo_n "checking for $ac_word... " >&6; }
1.2127 -if ${ac_cv_path_BUILD_CC+:} false; then :
1.2128 - $as_echo_n "(cached) " >&6
1.2129 -else
1.2130 - case $BUILD_CC in
1.2131 - [\\/]* | ?:[\\/]*)
1.2132 - ac_cv_path_BUILD_CC="$BUILD_CC" # Let the user override the test with a path.
1.2133 - ;;
1.2134 - *)
1.2135 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.2136 -for as_dir in $PATH
1.2137 -do
1.2138 - IFS=$as_save_IFS
1.2139 - test -z "$as_dir" && as_dir=.
1.2140 - for ac_exec_ext in '' $ac_executable_extensions; do
1.2141 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2142 - ac_cv_path_BUILD_CC="$as_dir/$ac_word$ac_exec_ext"
1.2143 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2144 - break 2
1.2145 - fi
1.2146 -done
1.2147 - done
1.2148 -IFS=$as_save_IFS
1.2149 -
1.2150 - ;;
1.2151 -esac
1.2152 -fi
1.2153 -BUILD_CC=$ac_cv_path_BUILD_CC
1.2154 -if test -n "$BUILD_CC"; then
1.2155 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
1.2156 -$as_echo "$BUILD_CC" >&6; }
1.2157 -else
1.2158 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.2159 -$as_echo "no" >&6; }
1.2160 -fi
1.2161 -
1.2162 -
1.2163 - if test "x$BUILD_CC" = x; then
1.2164 - as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.2165 - fi
1.2166 - else
1.2167 - # Otherwise we believe it is a complete path. Use it as it is.
1.2168 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool BUILD_CC=$tool_specified" >&5
1.2169 -$as_echo "$as_me: Will use user supplied tool BUILD_CC=$tool_specified" >&6;}
1.2170 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BUILD_CC" >&5
1.2171 -$as_echo_n "checking for BUILD_CC... " >&6; }
1.2172 - if test ! -x "$tool_specified"; then
1.2173 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.2174 -$as_echo "not found" >&6; }
1.2175 - as_fn_error $? "User supplied tool BUILD_CC=$tool_specified does not exist or is not executable" "$LINENO" 5
1.2176 - fi
1.2177 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.2178 -$as_echo "$tool_specified" >&6; }
1.2179 - fi
1.2180 - fi
1.2181 - fi
1.2182 -
1.2183 -
1.2184 -
1.2185 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2186 -
1.2187 - # First separate the path from the arguments. This will split at the first
1.2188 - # space.
1.2189 - complete="$BUILD_CC"
1.2190 - path="${complete%% *}"
1.2191 - tmp="$complete EOL"
1.2192 - arguments="${tmp#* }"
1.2193 -
1.2194 - # Input might be given as Windows format, start by converting to
1.2195 - # unix format.
1.2196 - new_path=`$CYGPATH -u "$path"`
1.2197 -
1.2198 - # Now try to locate executable using which
1.2199 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.2200 - # bat and cmd files are not always considered executable in cygwin causing which
1.2201 - # to not find them
1.2202 - if test "x$new_path" = x \
1.2203 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2204 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2205 - new_path=`$CYGPATH -u "$path"`
1.2206 - fi
1.2207 - if test "x$new_path" = x; then
1.2208 - # Oops. Which didn't find the executable.
1.2209 - # The splitting of arguments from the executable at a space might have been incorrect,
1.2210 - # since paths with space are more likely in Windows. Give it another try with the whole
1.2211 - # argument.
1.2212 - path="$complete"
1.2213 - arguments="EOL"
1.2214 - new_path=`$CYGPATH -u "$path"`
1.2215 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.2216 - # bat and cmd files are not always considered executable in cygwin causing which
1.2217 - # to not find them
1.2218 - if test "x$new_path" = x \
1.2219 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2220 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2221 - new_path=`$CYGPATH -u "$path"`
1.2222 - fi
1.2223 - if test "x$new_path" = x; then
1.2224 - # It's still not found. Now this is an unrecoverable error.
1.2225 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&5
1.2226 -$as_echo "$as_me: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&6;}
1.2227 - has_space=`$ECHO "$complete" | $GREP " "`
1.2228 - if test "x$has_space" != x; then
1.2229 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.2230 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.2231 - fi
1.2232 - as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5
1.2233 - fi
1.2234 - fi
1.2235 -
1.2236 - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.2237 - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.2238 - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.2239 - # "foo.exe" is OK but "foo" is an error.
1.2240 - #
1.2241 - # This test is therefore slightly more accurate than "test -f" to check for file presence.
1.2242 - # It is also a way to make sure we got the proper file name for the real test later on.
1.2243 - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.2244 - if test "x$test_shortpath" = x; then
1.2245 - # Short path failed, file does not exist as specified.
1.2246 - # Try adding .exe or .cmd
1.2247 - if test -f "${new_path}.exe"; then
1.2248 - input_to_shortpath="${new_path}.exe"
1.2249 - elif test -f "${new_path}.cmd"; then
1.2250 - input_to_shortpath="${new_path}.cmd"
1.2251 - else
1.2252 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$new_path\", is invalid." >&5
1.2253 -$as_echo "$as_me: The path of BUILD_CC, which resolves as \"$new_path\", is invalid." >&6;}
1.2254 - { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.2255 -$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.2256 - as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5
1.2257 - fi
1.2258 - else
1.2259 - input_to_shortpath="$new_path"
1.2260 - fi
1.2261 -
1.2262 - # Call helper function which possibly converts this using DOS-style short mode.
1.2263 - # If so, the updated path is stored in $new_path.
1.2264 - new_path="$input_to_shortpath"
1.2265 -
1.2266 - input_path="$input_to_shortpath"
1.2267 - # Check if we need to convert this using DOS-style short mode. If the path
1.2268 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.2269 - # take no chances and rewrite it.
1.2270 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.2271 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.2272 - if test "x$has_forbidden_chars" != x; then
1.2273 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.2274 - shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.2275 - path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.2276 - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.2277 - # Going to short mode and back again did indeed matter. Since short mode is
1.2278 - # case insensitive, let's make it lowercase to improve readability.
1.2279 - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.2280 - # Now convert it back to Unix-stile (cygpath)
1.2281 - input_path=`$CYGPATH -u "$shortmode_path"`
1.2282 - new_path="$input_path"
1.2283 - fi
1.2284 - fi
1.2285 -
1.2286 - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.2287 - if test "x$test_cygdrive_prefix" = x; then
1.2288 - # As a simple fix, exclude /usr/bin since it's not a real path.
1.2289 - if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
1.2290 - # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.2291 - # a path prefixed by /cygdrive for fixpath to work.
1.2292 - new_path="$CYGWIN_ROOT_PATH$input_path"
1.2293 - fi
1.2294 - fi
1.2295 -
1.2296 - # remove trailing .exe if any
1.2297 - new_path="${new_path/%.exe/}"
1.2298 -
1.2299 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2300 -
1.2301 - # First separate the path from the arguments. This will split at the first
1.2302 - # space.
1.2303 - complete="$BUILD_CC"
1.2304 - path="${complete%% *}"
1.2305 - tmp="$complete EOL"
1.2306 - arguments="${tmp#* }"
1.2307 -
1.2308 - # Input might be given as Windows format, start by converting to
1.2309 - # unix format.
1.2310 - new_path="$path"
1.2311 -
1.2312 - windows_path="$new_path"
1.2313 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2314 - unix_path=`$CYGPATH -u "$windows_path"`
1.2315 - new_path="$unix_path"
1.2316 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2317 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.2318 - new_path="$unix_path"
1.2319 - fi
1.2320 -
1.2321 -
1.2322 - # Now try to locate executable using which
1.2323 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.2324 -
1.2325 - if test "x$new_path" = x; then
1.2326 - # Oops. Which didn't find the executable.
1.2327 - # The splitting of arguments from the executable at a space might have been incorrect,
1.2328 - # since paths with space are more likely in Windows. Give it another try with the whole
1.2329 - # argument.
1.2330 - path="$complete"
1.2331 - arguments="EOL"
1.2332 - new_path="$path"
1.2333 -
1.2334 - windows_path="$new_path"
1.2335 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2336 - unix_path=`$CYGPATH -u "$windows_path"`
1.2337 - new_path="$unix_path"
1.2338 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2339 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.2340 - new_path="$unix_path"
1.2341 - fi
1.2342 -
1.2343 -
1.2344 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.2345 -
1.2346 - if test "x$new_path" = x; then
1.2347 - # It's still not found. Now this is an unrecoverable error.
1.2348 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&5
1.2349 -$as_echo "$as_me: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&6;}
1.2350 - has_space=`$ECHO "$complete" | $GREP " "`
1.2351 - if test "x$has_space" != x; then
1.2352 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.2353 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.2354 - fi
1.2355 - as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5
1.2356 - fi
1.2357 - fi
1.2358 -
1.2359 - # Now new_path has a complete unix path to the binary
1.2360 - if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
1.2361 - # Keep paths in /bin as-is, but remove trailing .exe if any
1.2362 - new_path="${new_path/%.exe/}"
1.2363 - # Do not save /bin paths to all_fixpath_prefixes!
1.2364 - else
1.2365 - # Not in mixed or Windows style, start by that.
1.2366 - new_path=`cmd //c echo $new_path`
1.2367 -
1.2368 - input_path="$new_path"
1.2369 - # Check if we need to convert this using DOS-style short mode. If the path
1.2370 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.2371 - # take no chances and rewrite it.
1.2372 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.2373 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.2374 - if test "x$has_forbidden_chars" != x; then
1.2375 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.2376 - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.2377 - fi
1.2378 -
1.2379 - # Output is in $new_path
1.2380 -
1.2381 - windows_path="$new_path"
1.2382 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2383 - unix_path=`$CYGPATH -u "$windows_path"`
1.2384 - new_path="$unix_path"
1.2385 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2386 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.2387 - new_path="$unix_path"
1.2388 - fi
1.2389 -
1.2390 - # remove trailing .exe if any
1.2391 - new_path="${new_path/%.exe/}"
1.2392 -
1.2393 - # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.2394 - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.2395 - fi
1.2396 -
1.2397 - else
1.2398 - # We're on a posix platform. Hooray! :)
1.2399 - # First separate the path from the arguments. This will split at the first
1.2400 - # space.
1.2401 - complete="$BUILD_CC"
1.2402 - path="${complete%% *}"
1.2403 - tmp="$complete EOL"
1.2404 - arguments="${tmp#* }"
1.2405 -
1.2406 - # Cannot rely on the command "which" here since it doesn't always work.
1.2407 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.2408 - if test -z "$is_absolute_path"; then
1.2409 - # Path to executable is not absolute. Find it.
1.2410 - IFS_save="$IFS"
1.2411 - IFS=:
1.2412 - for p in $PATH; do
1.2413 - if test -f "$p/$path" && test -x "$p/$path"; then
1.2414 - new_path="$p/$path"
1.2415 - break
1.2416 - fi
1.2417 - done
1.2418 - IFS="$IFS_save"
1.2419 - else
1.2420 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_CC (as $path) failed, using $path directly." >&5
1.2421 -$as_echo "$as_me: Resolving BUILD_CC (as $path) failed, using $path directly." >&6;}
1.2422 - new_path="$path"
1.2423 - fi
1.2424 -
1.2425 - if test "x$new_path" = x; then
1.2426 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&5
1.2427 -$as_echo "$as_me: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&6;}
1.2428 - has_space=`$ECHO "$complete" | $GREP " "`
1.2429 - if test "x$has_space" != x; then
1.2430 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.2431 -$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.2432 - fi
1.2433 - as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5
1.2434 - fi
1.2435 - fi
1.2436 -
1.2437 - # Now join together the path and the arguments once again
1.2438 - if test "x$arguments" != xEOL; then
1.2439 - new_complete="$new_path ${arguments% *}"
1.2440 - else
1.2441 - new_complete="$new_path"
1.2442 - fi
1.2443 -
1.2444 - if test "x$complete" != "x$new_complete"; then
1.2445 - BUILD_CC="$new_complete"
1.2446 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CC to \"$new_complete\"" >&5
1.2447 -$as_echo "$as_me: Rewriting BUILD_CC to \"$new_complete\"" >&6;}
1.2448 - fi
1.2449 -
1.2450 -
1.2451 -
1.2452 - # Publish this variable in the help.
1.2453 -
1.2454 -
1.2455 - if test "x$BUILD_CXX" = x; then
1.2456 - # The variable is not set by user, try to locate tool using the code snippet
1.2457 - for ac_prog in cl CC g++
1.2458 -do
1.2459 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.2460 -set dummy $ac_prog; ac_word=$2
1.2461 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2462 -$as_echo_n "checking for $ac_word... " >&6; }
1.2463 -if ${ac_cv_path_BUILD_CXX+:} false; then :
1.2464 - $as_echo_n "(cached) " >&6
1.2465 -else
1.2466 - case $BUILD_CXX in
1.2467 - [\\/]* | ?:[\\/]*)
1.2468 - ac_cv_path_BUILD_CXX="$BUILD_CXX" # Let the user override the test with a path.
1.2469 - ;;
1.2470 - *)
1.2471 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.2472 -for as_dir in $PATH
1.2473 -do
1.2474 - IFS=$as_save_IFS
1.2475 - test -z "$as_dir" && as_dir=.
1.2476 - for ac_exec_ext in '' $ac_executable_extensions; do
1.2477 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2478 - ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
1.2479 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2480 - break 2
1.2481 - fi
1.2482 -done
1.2483 - done
1.2484 -IFS=$as_save_IFS
1.2485 -
1.2486 - ;;
1.2487 -esac
1.2488 -fi
1.2489 -BUILD_CXX=$ac_cv_path_BUILD_CXX
1.2490 -if test -n "$BUILD_CXX"; then
1.2491 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CXX" >&5
1.2492 -$as_echo "$BUILD_CXX" >&6; }
1.2493 -else
1.2494 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.2495 -$as_echo "no" >&6; }
1.2496 -fi
1.2497 -
1.2498 -
1.2499 - test -n "$BUILD_CXX" && break
1.2500 -done
1.2501 -
1.2502 - else
1.2503 - # The variable is set, but is it from the command line or the environment?
1.2504 -
1.2505 - # Try to remove the string !BUILD_CXX! from our list.
1.2506 - try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!BUILD_CXX!/}
1.2507 - if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.2508 - # If it failed, the variable was not from the command line. Ignore it,
1.2509 - # but warn the user (except for BASH, which is always set by the calling BASH).
1.2510 - if test "xBUILD_CXX" != xBASH; then
1.2511 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of BUILD_CXX from the environment. Use command line variables instead." >&5
1.2512 -$as_echo "$as_me: WARNING: Ignoring value of BUILD_CXX from the environment. Use command line variables instead." >&2;}
1.2513 - fi
1.2514 - # Try to locate tool using the code snippet
1.2515 - for ac_prog in cl CC g++
1.2516 -do
1.2517 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.2518 -set dummy $ac_prog; ac_word=$2
1.2519 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2520 -$as_echo_n "checking for $ac_word... " >&6; }
1.2521 -if ${ac_cv_path_BUILD_CXX+:} false; then :
1.2522 - $as_echo_n "(cached) " >&6
1.2523 -else
1.2524 - case $BUILD_CXX in
1.2525 - [\\/]* | ?:[\\/]*)
1.2526 - ac_cv_path_BUILD_CXX="$BUILD_CXX" # Let the user override the test with a path.
1.2527 - ;;
1.2528 - *)
1.2529 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.2530 -for as_dir in $PATH
1.2531 -do
1.2532 - IFS=$as_save_IFS
1.2533 - test -z "$as_dir" && as_dir=.
1.2534 - for ac_exec_ext in '' $ac_executable_extensions; do
1.2535 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2536 - ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
1.2537 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2538 - break 2
1.2539 - fi
1.2540 -done
1.2541 - done
1.2542 -IFS=$as_save_IFS
1.2543 -
1.2544 - ;;
1.2545 -esac
1.2546 -fi
1.2547 -BUILD_CXX=$ac_cv_path_BUILD_CXX
1.2548 -if test -n "$BUILD_CXX"; then
1.2549 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CXX" >&5
1.2550 -$as_echo "$BUILD_CXX" >&6; }
1.2551 -else
1.2552 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.2553 -$as_echo "no" >&6; }
1.2554 -fi
1.2555 -
1.2556 -
1.2557 - test -n "$BUILD_CXX" && break
1.2558 -done
1.2559 -
1.2560 - else
1.2561 - # If it succeeded, then it was overridden by the user. We will use it
1.2562 - # for the tool.
1.2563 -
1.2564 - # First remove it from the list of overridden variables, so we can test
1.2565 - # for unknown variables in the end.
1.2566 - CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.2567 -
1.2568 - # Check if the provided tool contains a complete path.
1.2569 - tool_specified="$BUILD_CXX"
1.2570 - tool_basename="${tool_specified##*/}"
1.2571 - if test "x$tool_basename" = "x$tool_specified"; then
1.2572 - # A command without a complete path is provided, search $PATH.
1.2573 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool BUILD_CXX=$tool_basename" >&5
1.2574 -$as_echo "$as_me: Will search for user supplied tool BUILD_CXX=$tool_basename" >&6;}
1.2575 - # Extract the first word of "$tool_basename", so it can be a program name with args.
1.2576 -set dummy $tool_basename; ac_word=$2
1.2577 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2578 -$as_echo_n "checking for $ac_word... " >&6; }
1.2579 -if ${ac_cv_path_BUILD_CXX+:} false; then :
1.2580 - $as_echo_n "(cached) " >&6
1.2581 -else
1.2582 - case $BUILD_CXX in
1.2583 - [\\/]* | ?:[\\/]*)
1.2584 - ac_cv_path_BUILD_CXX="$BUILD_CXX" # Let the user override the test with a path.
1.2585 - ;;
1.2586 - *)
1.2587 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.2588 -for as_dir in $PATH
1.2589 -do
1.2590 - IFS=$as_save_IFS
1.2591 - test -z "$as_dir" && as_dir=.
1.2592 - for ac_exec_ext in '' $ac_executable_extensions; do
1.2593 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2594 - ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
1.2595 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2596 - break 2
1.2597 - fi
1.2598 -done
1.2599 - done
1.2600 -IFS=$as_save_IFS
1.2601 -
1.2602 - ;;
1.2603 -esac
1.2604 -fi
1.2605 -BUILD_CXX=$ac_cv_path_BUILD_CXX
1.2606 -if test -n "$BUILD_CXX"; then
1.2607 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CXX" >&5
1.2608 -$as_echo "$BUILD_CXX" >&6; }
1.2609 -else
1.2610 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.2611 -$as_echo "no" >&6; }
1.2612 -fi
1.2613 -
1.2614 -
1.2615 - if test "x$BUILD_CXX" = x; then
1.2616 - as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.2617 - fi
1.2618 - else
1.2619 - # Otherwise we believe it is a complete path. Use it as it is.
1.2620 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool BUILD_CXX=$tool_specified" >&5
1.2621 -$as_echo "$as_me: Will use user supplied tool BUILD_CXX=$tool_specified" >&6;}
1.2622 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BUILD_CXX" >&5
1.2623 -$as_echo_n "checking for BUILD_CXX... " >&6; }
1.2624 - if test ! -x "$tool_specified"; then
1.2625 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.2626 -$as_echo "not found" >&6; }
1.2627 - as_fn_error $? "User supplied tool BUILD_CXX=$tool_specified does not exist or is not executable" "$LINENO" 5
1.2628 - fi
1.2629 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.2630 -$as_echo "$tool_specified" >&6; }
1.2631 - fi
1.2632 - fi
1.2633 - fi
1.2634 -
1.2635 -
1.2636 -
1.2637 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2638 -
1.2639 - # First separate the path from the arguments. This will split at the first
1.2640 - # space.
1.2641 - complete="$BUILD_CXX"
1.2642 - path="${complete%% *}"
1.2643 - tmp="$complete EOL"
1.2644 - arguments="${tmp#* }"
1.2645 -
1.2646 - # Input might be given as Windows format, start by converting to
1.2647 - # unix format.
1.2648 - new_path=`$CYGPATH -u "$path"`
1.2649 -
1.2650 - # Now try to locate executable using which
1.2651 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.2652 - # bat and cmd files are not always considered executable in cygwin causing which
1.2653 - # to not find them
1.2654 - if test "x$new_path" = x \
1.2655 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2656 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2657 - new_path=`$CYGPATH -u "$path"`
1.2658 - fi
1.2659 - if test "x$new_path" = x; then
1.2660 - # Oops. Which didn't find the executable.
1.2661 - # The splitting of arguments from the executable at a space might have been incorrect,
1.2662 - # since paths with space are more likely in Windows. Give it another try with the whole
1.2663 - # argument.
1.2664 - path="$complete"
1.2665 - arguments="EOL"
1.2666 - new_path=`$CYGPATH -u "$path"`
1.2667 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.2668 - # bat and cmd files are not always considered executable in cygwin causing which
1.2669 - # to not find them
1.2670 - if test "x$new_path" = x \
1.2671 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2672 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2673 - new_path=`$CYGPATH -u "$path"`
1.2674 - fi
1.2675 - if test "x$new_path" = x; then
1.2676 - # It's still not found. Now this is an unrecoverable error.
1.2677 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&5
1.2678 -$as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&6;}
1.2679 - has_space=`$ECHO "$complete" | $GREP " "`
1.2680 - if test "x$has_space" != x; then
1.2681 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.2682 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.2683 - fi
1.2684 - as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5
1.2685 - fi
1.2686 - fi
1.2687 -
1.2688 - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.2689 - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.2690 - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.2691 - # "foo.exe" is OK but "foo" is an error.
1.2692 - #
1.2693 - # This test is therefore slightly more accurate than "test -f" to check for file presence.
1.2694 - # It is also a way to make sure we got the proper file name for the real test later on.
1.2695 - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.2696 - if test "x$test_shortpath" = x; then
1.2697 - # Short path failed, file does not exist as specified.
1.2698 - # Try adding .exe or .cmd
1.2699 - if test -f "${new_path}.exe"; then
1.2700 - input_to_shortpath="${new_path}.exe"
1.2701 - elif test -f "${new_path}.cmd"; then
1.2702 - input_to_shortpath="${new_path}.cmd"
1.2703 - else
1.2704 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$new_path\", is invalid." >&5
1.2705 -$as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$new_path\", is invalid." >&6;}
1.2706 - { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.2707 -$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.2708 - as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5
1.2709 - fi
1.2710 - else
1.2711 - input_to_shortpath="$new_path"
1.2712 - fi
1.2713 -
1.2714 - # Call helper function which possibly converts this using DOS-style short mode.
1.2715 - # If so, the updated path is stored in $new_path.
1.2716 - new_path="$input_to_shortpath"
1.2717 -
1.2718 - input_path="$input_to_shortpath"
1.2719 - # Check if we need to convert this using DOS-style short mode. If the path
1.2720 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.2721 - # take no chances and rewrite it.
1.2722 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.2723 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.2724 - if test "x$has_forbidden_chars" != x; then
1.2725 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.2726 - shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.2727 - path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.2728 - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.2729 - # Going to short mode and back again did indeed matter. Since short mode is
1.2730 - # case insensitive, let's make it lowercase to improve readability.
1.2731 - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.2732 - # Now convert it back to Unix-stile (cygpath)
1.2733 - input_path=`$CYGPATH -u "$shortmode_path"`
1.2734 - new_path="$input_path"
1.2735 - fi
1.2736 - fi
1.2737 -
1.2738 - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.2739 - if test "x$test_cygdrive_prefix" = x; then
1.2740 - # As a simple fix, exclude /usr/bin since it's not a real path.
1.2741 - if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
1.2742 - # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.2743 - # a path prefixed by /cygdrive for fixpath to work.
1.2744 - new_path="$CYGWIN_ROOT_PATH$input_path"
1.2745 - fi
1.2746 - fi
1.2747 -
1.2748 - # remove trailing .exe if any
1.2749 - new_path="${new_path/%.exe/}"
1.2750 -
1.2751 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2752 -
1.2753 - # First separate the path from the arguments. This will split at the first
1.2754 - # space.
1.2755 - complete="$BUILD_CXX"
1.2756 - path="${complete%% *}"
1.2757 - tmp="$complete EOL"
1.2758 - arguments="${tmp#* }"
1.2759 -
1.2760 - # Input might be given as Windows format, start by converting to
1.2761 - # unix format.
1.2762 - new_path="$path"
1.2763 -
1.2764 - windows_path="$new_path"
1.2765 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2766 - unix_path=`$CYGPATH -u "$windows_path"`
1.2767 - new_path="$unix_path"
1.2768 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2769 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.2770 - new_path="$unix_path"
1.2771 - fi
1.2772 -
1.2773 -
1.2774 - # Now try to locate executable using which
1.2775 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.2776 -
1.2777 - if test "x$new_path" = x; then
1.2778 - # Oops. Which didn't find the executable.
1.2779 - # The splitting of arguments from the executable at a space might have been incorrect,
1.2780 - # since paths with space are more likely in Windows. Give it another try with the whole
1.2781 - # argument.
1.2782 - path="$complete"
1.2783 - arguments="EOL"
1.2784 - new_path="$path"
1.2785 -
1.2786 - windows_path="$new_path"
1.2787 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2788 - unix_path=`$CYGPATH -u "$windows_path"`
1.2789 - new_path="$unix_path"
1.2790 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2791 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.2792 - new_path="$unix_path"
1.2793 - fi
1.2794 -
1.2795 -
1.2796 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.2797 -
1.2798 - if test "x$new_path" = x; then
1.2799 - # It's still not found. Now this is an unrecoverable error.
1.2800 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&5
1.2801 -$as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&6;}
1.2802 - has_space=`$ECHO "$complete" | $GREP " "`
1.2803 - if test "x$has_space" != x; then
1.2804 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.2805 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.2806 - fi
1.2807 - as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5
1.2808 - fi
1.2809 - fi
1.2810 -
1.2811 - # Now new_path has a complete unix path to the binary
1.2812 - if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
1.2813 - # Keep paths in /bin as-is, but remove trailing .exe if any
1.2814 - new_path="${new_path/%.exe/}"
1.2815 - # Do not save /bin paths to all_fixpath_prefixes!
1.2816 - else
1.2817 - # Not in mixed or Windows style, start by that.
1.2818 - new_path=`cmd //c echo $new_path`
1.2819 -
1.2820 - input_path="$new_path"
1.2821 - # Check if we need to convert this using DOS-style short mode. If the path
1.2822 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.2823 - # take no chances and rewrite it.
1.2824 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.2825 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.2826 - if test "x$has_forbidden_chars" != x; then
1.2827 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.2828 - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.2829 - fi
1.2830 -
1.2831 - # Output is in $new_path
1.2832 -
1.2833 - windows_path="$new_path"
1.2834 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2835 - unix_path=`$CYGPATH -u "$windows_path"`
1.2836 - new_path="$unix_path"
1.2837 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2838 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.2839 - new_path="$unix_path"
1.2840 - fi
1.2841 -
1.2842 - # remove trailing .exe if any
1.2843 - new_path="${new_path/%.exe/}"
1.2844 -
1.2845 - # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.2846 - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.2847 - fi
1.2848 -
1.2849 - else
1.2850 - # We're on a posix platform. Hooray! :)
1.2851 - # First separate the path from the arguments. This will split at the first
1.2852 - # space.
1.2853 - complete="$BUILD_CXX"
1.2854 - path="${complete%% *}"
1.2855 - tmp="$complete EOL"
1.2856 - arguments="${tmp#* }"
1.2857 -
1.2858 - # Cannot rely on the command "which" here since it doesn't always work.
1.2859 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.2860 - if test -z "$is_absolute_path"; then
1.2861 - # Path to executable is not absolute. Find it.
1.2862 - IFS_save="$IFS"
1.2863 - IFS=:
1.2864 - for p in $PATH; do
1.2865 - if test -f "$p/$path" && test -x "$p/$path"; then
1.2866 - new_path="$p/$path"
1.2867 - break
1.2868 - fi
1.2869 - done
1.2870 - IFS="$IFS_save"
1.2871 - else
1.2872 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_CXX (as $path) failed, using $path directly." >&5
1.2873 -$as_echo "$as_me: Resolving BUILD_CXX (as $path) failed, using $path directly." >&6;}
1.2874 - new_path="$path"
1.2875 - fi
1.2876 -
1.2877 - if test "x$new_path" = x; then
1.2878 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&5
1.2879 -$as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&6;}
1.2880 - has_space=`$ECHO "$complete" | $GREP " "`
1.2881 - if test "x$has_space" != x; then
1.2882 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.2883 -$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.2884 - fi
1.2885 - as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5
1.2886 - fi
1.2887 - fi
1.2888 -
1.2889 - # Now join together the path and the arguments once again
1.2890 - if test "x$arguments" != xEOL; then
1.2891 - new_complete="$new_path ${arguments% *}"
1.2892 - else
1.2893 - new_complete="$new_path"
1.2894 - fi
1.2895 -
1.2896 - if test "x$complete" != "x$new_complete"; then
1.2897 - BUILD_CXX="$new_complete"
1.2898 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CXX to \"$new_complete\"" >&5
1.2899 -$as_echo "$as_me: Rewriting BUILD_CXX to \"$new_complete\"" >&6;}
1.2900 - fi
1.2901 -
1.2902 -
1.2903 -
1.2904 - # Publish this variable in the help.
1.2905 -
1.2906 -
1.2907 - if test "x$BUILD_LD" = x; then
1.2908 - # The variable is not set by user, try to locate tool using the code snippet
1.2909 - for ac_prog in ld
1.2910 -do
1.2911 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.2912 -set dummy $ac_prog; ac_word=$2
1.2913 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2914 -$as_echo_n "checking for $ac_word... " >&6; }
1.2915 -if ${ac_cv_path_BUILD_LD+:} false; then :
1.2916 - $as_echo_n "(cached) " >&6
1.2917 -else
1.2918 - case $BUILD_LD in
1.2919 - [\\/]* | ?:[\\/]*)
1.2920 - ac_cv_path_BUILD_LD="$BUILD_LD" # Let the user override the test with a path.
1.2921 - ;;
1.2922 - *)
1.2923 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.2924 -for as_dir in $PATH
1.2925 -do
1.2926 - IFS=$as_save_IFS
1.2927 - test -z "$as_dir" && as_dir=.
1.2928 - for ac_exec_ext in '' $ac_executable_extensions; do
1.2929 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2930 - ac_cv_path_BUILD_LD="$as_dir/$ac_word$ac_exec_ext"
1.2931 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2932 - break 2
1.2933 - fi
1.2934 -done
1.2935 - done
1.2936 -IFS=$as_save_IFS
1.2937 -
1.2938 - ;;
1.2939 -esac
1.2940 -fi
1.2941 -BUILD_LD=$ac_cv_path_BUILD_LD
1.2942 -if test -n "$BUILD_LD"; then
1.2943 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_LD" >&5
1.2944 -$as_echo "$BUILD_LD" >&6; }
1.2945 -else
1.2946 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.2947 -$as_echo "no" >&6; }
1.2948 -fi
1.2949 -
1.2950 -
1.2951 - test -n "$BUILD_LD" && break
1.2952 -done
1.2953 -
1.2954 - else
1.2955 - # The variable is set, but is it from the command line or the environment?
1.2956 -
1.2957 - # Try to remove the string !BUILD_LD! from our list.
1.2958 - try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!BUILD_LD!/}
1.2959 - if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.2960 - # If it failed, the variable was not from the command line. Ignore it,
1.2961 - # but warn the user (except for BASH, which is always set by the calling BASH).
1.2962 - if test "xBUILD_LD" != xBASH; then
1.2963 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of BUILD_LD from the environment. Use command line variables instead." >&5
1.2964 -$as_echo "$as_me: WARNING: Ignoring value of BUILD_LD from the environment. Use command line variables instead." >&2;}
1.2965 - fi
1.2966 - # Try to locate tool using the code snippet
1.2967 - for ac_prog in ld
1.2968 -do
1.2969 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.2970 -set dummy $ac_prog; ac_word=$2
1.2971 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2972 -$as_echo_n "checking for $ac_word... " >&6; }
1.2973 -if ${ac_cv_path_BUILD_LD+:} false; then :
1.2974 - $as_echo_n "(cached) " >&6
1.2975 -else
1.2976 - case $BUILD_LD in
1.2977 - [\\/]* | ?:[\\/]*)
1.2978 - ac_cv_path_BUILD_LD="$BUILD_LD" # Let the user override the test with a path.
1.2979 - ;;
1.2980 - *)
1.2981 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.2982 -for as_dir in $PATH
1.2983 -do
1.2984 - IFS=$as_save_IFS
1.2985 - test -z "$as_dir" && as_dir=.
1.2986 - for ac_exec_ext in '' $ac_executable_extensions; do
1.2987 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2988 - ac_cv_path_BUILD_LD="$as_dir/$ac_word$ac_exec_ext"
1.2989 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2990 - break 2
1.2991 - fi
1.2992 -done
1.2993 - done
1.2994 -IFS=$as_save_IFS
1.2995 -
1.2996 - ;;
1.2997 -esac
1.2998 -fi
1.2999 -BUILD_LD=$ac_cv_path_BUILD_LD
1.3000 -if test -n "$BUILD_LD"; then
1.3001 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_LD" >&5
1.3002 -$as_echo "$BUILD_LD" >&6; }
1.3003 -else
1.3004 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.3005 -$as_echo "no" >&6; }
1.3006 -fi
1.3007 -
1.3008 -
1.3009 - test -n "$BUILD_LD" && break
1.3010 -done
1.3011 -
1.3012 - else
1.3013 - # If it succeeded, then it was overridden by the user. We will use it
1.3014 - # for the tool.
1.3015 -
1.3016 - # First remove it from the list of overridden variables, so we can test
1.3017 - # for unknown variables in the end.
1.3018 - CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.3019 -
1.3020 - # Check if the provided tool contains a complete path.
1.3021 - tool_specified="$BUILD_LD"
1.3022 - tool_basename="${tool_specified##*/}"
1.3023 - if test "x$tool_basename" = "x$tool_specified"; then
1.3024 - # A command without a complete path is provided, search $PATH.
1.3025 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool BUILD_LD=$tool_basename" >&5
1.3026 -$as_echo "$as_me: Will search for user supplied tool BUILD_LD=$tool_basename" >&6;}
1.3027 - # Extract the first word of "$tool_basename", so it can be a program name with args.
1.3028 -set dummy $tool_basename; ac_word=$2
1.3029 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.3030 -$as_echo_n "checking for $ac_word... " >&6; }
1.3031 -if ${ac_cv_path_BUILD_LD+:} false; then :
1.3032 - $as_echo_n "(cached) " >&6
1.3033 -else
1.3034 - case $BUILD_LD in
1.3035 - [\\/]* | ?:[\\/]*)
1.3036 - ac_cv_path_BUILD_LD="$BUILD_LD" # Let the user override the test with a path.
1.3037 - ;;
1.3038 - *)
1.3039 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.3040 -for as_dir in $PATH
1.3041 -do
1.3042 - IFS=$as_save_IFS
1.3043 - test -z "$as_dir" && as_dir=.
1.3044 - for ac_exec_ext in '' $ac_executable_extensions; do
1.3045 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.3046 - ac_cv_path_BUILD_LD="$as_dir/$ac_word$ac_exec_ext"
1.3047 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.3048 - break 2
1.3049 - fi
1.3050 -done
1.3051 - done
1.3052 -IFS=$as_save_IFS
1.3053 -
1.3054 - ;;
1.3055 -esac
1.3056 -fi
1.3057 -BUILD_LD=$ac_cv_path_BUILD_LD
1.3058 -if test -n "$BUILD_LD"; then
1.3059 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_LD" >&5
1.3060 -$as_echo "$BUILD_LD" >&6; }
1.3061 -else
1.3062 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.3063 -$as_echo "no" >&6; }
1.3064 -fi
1.3065 -
1.3066 -
1.3067 - if test "x$BUILD_LD" = x; then
1.3068 - as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.3069 - fi
1.3070 - else
1.3071 - # Otherwise we believe it is a complete path. Use it as it is.
1.3072 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool BUILD_LD=$tool_specified" >&5
1.3073 -$as_echo "$as_me: Will use user supplied tool BUILD_LD=$tool_specified" >&6;}
1.3074 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BUILD_LD" >&5
1.3075 -$as_echo_n "checking for BUILD_LD... " >&6; }
1.3076 - if test ! -x "$tool_specified"; then
1.3077 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.3078 -$as_echo "not found" >&6; }
1.3079 - as_fn_error $? "User supplied tool BUILD_LD=$tool_specified does not exist or is not executable" "$LINENO" 5
1.3080 - fi
1.3081 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.3082 -$as_echo "$tool_specified" >&6; }
1.3083 - fi
1.3084 - fi
1.3085 - fi
1.3086 -
1.3087 -
1.3088 -
1.3089 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.3090 -
1.3091 - # First separate the path from the arguments. This will split at the first
1.3092 - # space.
1.3093 - complete="$BUILD_LD"
1.3094 - path="${complete%% *}"
1.3095 - tmp="$complete EOL"
1.3096 - arguments="${tmp#* }"
1.3097 -
1.3098 - # Input might be given as Windows format, start by converting to
1.3099 - # unix format.
1.3100 - new_path=`$CYGPATH -u "$path"`
1.3101 -
1.3102 - # Now try to locate executable using which
1.3103 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.3104 - # bat and cmd files are not always considered executable in cygwin causing which
1.3105 - # to not find them
1.3106 - if test "x$new_path" = x \
1.3107 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.3108 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.3109 - new_path=`$CYGPATH -u "$path"`
1.3110 - fi
1.3111 - if test "x$new_path" = x; then
1.3112 - # Oops. Which didn't find the executable.
1.3113 - # The splitting of arguments from the executable at a space might have been incorrect,
1.3114 - # since paths with space are more likely in Windows. Give it another try with the whole
1.3115 - # argument.
1.3116 - path="$complete"
1.3117 - arguments="EOL"
1.3118 - new_path=`$CYGPATH -u "$path"`
1.3119 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.3120 - # bat and cmd files are not always considered executable in cygwin causing which
1.3121 - # to not find them
1.3122 - if test "x$new_path" = x \
1.3123 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.3124 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.3125 - new_path=`$CYGPATH -u "$path"`
1.3126 - fi
1.3127 - if test "x$new_path" = x; then
1.3128 - # It's still not found. Now this is an unrecoverable error.
1.3129 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&5
1.3130 -$as_echo "$as_me: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&6;}
1.3131 - has_space=`$ECHO "$complete" | $GREP " "`
1.3132 - if test "x$has_space" != x; then
1.3133 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.3134 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.3135 - fi
1.3136 - as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5
1.3137 - fi
1.3138 - fi
1.3139 -
1.3140 - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.3141 - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.3142 - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.3143 - # "foo.exe" is OK but "foo" is an error.
1.3144 - #
1.3145 - # This test is therefore slightly more accurate than "test -f" to check for file presence.
1.3146 - # It is also a way to make sure we got the proper file name for the real test later on.
1.3147 - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.3148 - if test "x$test_shortpath" = x; then
1.3149 - # Short path failed, file does not exist as specified.
1.3150 - # Try adding .exe or .cmd
1.3151 - if test -f "${new_path}.exe"; then
1.3152 - input_to_shortpath="${new_path}.exe"
1.3153 - elif test -f "${new_path}.cmd"; then
1.3154 - input_to_shortpath="${new_path}.cmd"
1.3155 - else
1.3156 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$new_path\", is invalid." >&5
1.3157 -$as_echo "$as_me: The path of BUILD_LD, which resolves as \"$new_path\", is invalid." >&6;}
1.3158 - { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.3159 -$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.3160 - as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5
1.3161 - fi
1.3162 - else
1.3163 - input_to_shortpath="$new_path"
1.3164 - fi
1.3165 -
1.3166 - # Call helper function which possibly converts this using DOS-style short mode.
1.3167 - # If so, the updated path is stored in $new_path.
1.3168 - new_path="$input_to_shortpath"
1.3169 -
1.3170 - input_path="$input_to_shortpath"
1.3171 - # Check if we need to convert this using DOS-style short mode. If the path
1.3172 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.3173 - # take no chances and rewrite it.
1.3174 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.3175 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.3176 - if test "x$has_forbidden_chars" != x; then
1.3177 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.3178 - shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.3179 - path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.3180 - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.3181 - # Going to short mode and back again did indeed matter. Since short mode is
1.3182 - # case insensitive, let's make it lowercase to improve readability.
1.3183 - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.3184 - # Now convert it back to Unix-stile (cygpath)
1.3185 - input_path=`$CYGPATH -u "$shortmode_path"`
1.3186 - new_path="$input_path"
1.3187 - fi
1.3188 - fi
1.3189 -
1.3190 - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.3191 - if test "x$test_cygdrive_prefix" = x; then
1.3192 - # As a simple fix, exclude /usr/bin since it's not a real path.
1.3193 - if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
1.3194 - # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.3195 - # a path prefixed by /cygdrive for fixpath to work.
1.3196 - new_path="$CYGWIN_ROOT_PATH$input_path"
1.3197 - fi
1.3198 - fi
1.3199 -
1.3200 - # remove trailing .exe if any
1.3201 - new_path="${new_path/%.exe/}"
1.3202 -
1.3203 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.3204 -
1.3205 - # First separate the path from the arguments. This will split at the first
1.3206 - # space.
1.3207 - complete="$BUILD_LD"
1.3208 - path="${complete%% *}"
1.3209 - tmp="$complete EOL"
1.3210 - arguments="${tmp#* }"
1.3211 -
1.3212 - # Input might be given as Windows format, start by converting to
1.3213 - # unix format.
1.3214 - new_path="$path"
1.3215 -
1.3216 - windows_path="$new_path"
1.3217 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.3218 - unix_path=`$CYGPATH -u "$windows_path"`
1.3219 - new_path="$unix_path"
1.3220 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.3221 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.3222 - new_path="$unix_path"
1.3223 - fi
1.3224 -
1.3225 -
1.3226 - # Now try to locate executable using which
1.3227 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.3228 -
1.3229 - if test "x$new_path" = x; then
1.3230 - # Oops. Which didn't find the executable.
1.3231 - # The splitting of arguments from the executable at a space might have been incorrect,
1.3232 - # since paths with space are more likely in Windows. Give it another try with the whole
1.3233 - # argument.
1.3234 - path="$complete"
1.3235 - arguments="EOL"
1.3236 - new_path="$path"
1.3237 -
1.3238 - windows_path="$new_path"
1.3239 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.3240 - unix_path=`$CYGPATH -u "$windows_path"`
1.3241 - new_path="$unix_path"
1.3242 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.3243 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.3244 - new_path="$unix_path"
1.3245 - fi
1.3246 -
1.3247 -
1.3248 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.3249 -
1.3250 - if test "x$new_path" = x; then
1.3251 - # It's still not found. Now this is an unrecoverable error.
1.3252 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&5
1.3253 -$as_echo "$as_me: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&6;}
1.3254 - has_space=`$ECHO "$complete" | $GREP " "`
1.3255 - if test "x$has_space" != x; then
1.3256 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.3257 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.3258 - fi
1.3259 - as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5
1.3260 - fi
1.3261 - fi
1.3262 -
1.3263 - # Now new_path has a complete unix path to the binary
1.3264 - if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
1.3265 - # Keep paths in /bin as-is, but remove trailing .exe if any
1.3266 - new_path="${new_path/%.exe/}"
1.3267 - # Do not save /bin paths to all_fixpath_prefixes!
1.3268 - else
1.3269 - # Not in mixed or Windows style, start by that.
1.3270 - new_path=`cmd //c echo $new_path`
1.3271 -
1.3272 - input_path="$new_path"
1.3273 - # Check if we need to convert this using DOS-style short mode. If the path
1.3274 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.3275 - # take no chances and rewrite it.
1.3276 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.3277 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.3278 - if test "x$has_forbidden_chars" != x; then
1.3279 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.3280 - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.3281 - fi
1.3282 -
1.3283 - # Output is in $new_path
1.3284 -
1.3285 - windows_path="$new_path"
1.3286 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.3287 - unix_path=`$CYGPATH -u "$windows_path"`
1.3288 - new_path="$unix_path"
1.3289 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.3290 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.3291 - new_path="$unix_path"
1.3292 - fi
1.3293 -
1.3294 - # remove trailing .exe if any
1.3295 - new_path="${new_path/%.exe/}"
1.3296 -
1.3297 - # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.3298 - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.3299 - fi
1.3300 -
1.3301 - else
1.3302 - # We're on a posix platform. Hooray! :)
1.3303 - # First separate the path from the arguments. This will split at the first
1.3304 - # space.
1.3305 - complete="$BUILD_LD"
1.3306 - path="${complete%% *}"
1.3307 - tmp="$complete EOL"
1.3308 - arguments="${tmp#* }"
1.3309 -
1.3310 - # Cannot rely on the command "which" here since it doesn't always work.
1.3311 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.3312 - if test -z "$is_absolute_path"; then
1.3313 - # Path to executable is not absolute. Find it.
1.3314 - IFS_save="$IFS"
1.3315 - IFS=:
1.3316 - for p in $PATH; do
1.3317 - if test -f "$p/$path" && test -x "$p/$path"; then
1.3318 - new_path="$p/$path"
1.3319 - break
1.3320 - fi
1.3321 - done
1.3322 - IFS="$IFS_save"
1.3323 - else
1.3324 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_LD (as $path) failed, using $path directly." >&5
1.3325 -$as_echo "$as_me: Resolving BUILD_LD (as $path) failed, using $path directly." >&6;}
1.3326 - new_path="$path"
1.3327 - fi
1.3328 -
1.3329 - if test "x$new_path" = x; then
1.3330 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&5
1.3331 -$as_echo "$as_me: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&6;}
1.3332 - has_space=`$ECHO "$complete" | $GREP " "`
1.3333 - if test "x$has_space" != x; then
1.3334 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.3335 -$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.3336 - fi
1.3337 - as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5
1.3338 - fi
1.3339 - fi
1.3340 -
1.3341 - # Now join together the path and the arguments once again
1.3342 - if test "x$arguments" != xEOL; then
1.3343 - new_complete="$new_path ${arguments% *}"
1.3344 - else
1.3345 - new_complete="$new_path"
1.3346 - fi
1.3347 -
1.3348 - if test "x$complete" != "x$new_complete"; then
1.3349 - BUILD_LD="$new_complete"
1.3350 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_LD to \"$new_complete\"" >&5
1.3351 -$as_echo "$as_me: Rewriting BUILD_LD to \"$new_complete\"" >&6;}
1.3352 - fi
1.3353 -
1.3354 - fi
1.3355 -
1.3356 -
1.3357 -
1.3358 + fi
1.3359 +
1.3360 + # Finally add TOOLS_DIR at the beginning, to allow --with-tools-dir to
1.3361 + # override all other locations.
1.3362 + if test "x$TOOLS_DIR" != x; then
1.3363 + PATH=$TOOLS_DIR:$PATH
1.3364 + fi
1.3365
1.3366 # If a devkit is found on the builddeps server, then prepend its path to the
1.3367 # PATH variable. If there are cross compilers available in the devkit, these
1.3368 @@ -27838,173 +26041,96 @@
1.3369 fi
1.3370
1.3371
1.3372 - # Store the CFLAGS etal passed to the configure script.
1.3373 - ORG_CFLAGS="$CFLAGS"
1.3374 - ORG_CXXFLAGS="$CXXFLAGS"
1.3375 - ORG_OBJCFLAGS="$OBJCFLAGS"
1.3376 -
1.3377 - # autoconf magic only relies on PATH, so update it if tools dir is specified
1.3378 - OLD_PATH="$PATH"
1.3379 - if test "x$TOOLS_DIR" != x; then
1.3380 - PATH=$TOOLS_DIR:$PATH
1.3381 - fi
1.3382 -
1.3383 - # Before we locate the compilers, we need to sanitize the Xcode build environment
1.3384 - if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.3385 - # determine path to Xcode developer directory
1.3386 - # can be empty in which case all the tools will rely on a sane Xcode 4 installation
1.3387 - SET_DEVELOPER_DIR=
1.3388 -
1.3389 - if test -n "$XCODE_PATH"; then
1.3390 - DEVELOPER_DIR="$XCODE_PATH"/Contents/Developer
1.3391 - fi
1.3392 -
1.3393 - # DEVELOPER_DIR could also be provided directly
1.3394 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Determining if we need to set DEVELOPER_DIR" >&5
1.3395 -$as_echo_n "checking Determining if we need to set DEVELOPER_DIR... " >&6; }
1.3396 - if test -n "$DEVELOPER_DIR"; then
1.3397 - if test ! -d "$DEVELOPER_DIR"; then
1.3398 - as_fn_error $? "Xcode Developer path does not exist: $DEVELOPER_DIR, please provide a path to the Xcode 4 application bundle using --with-xcode-path" "$LINENO" 5
1.3399 - fi
1.3400 - if test ! -f "$DEVELOPER_DIR"/usr/bin/xcodebuild; then
1.3401 - as_fn_error $? "Xcode Developer path is not valid: $DEVELOPER_DIR, it must point to Contents/Developer inside an Xcode application bundle" "$LINENO" 5
1.3402 - fi
1.3403 - # make it visible to all the tools immediately
1.3404 - export DEVELOPER_DIR
1.3405 - SET_DEVELOPER_DIR="export DEVELOPER_DIR := $DEVELOPER_DIR"
1.3406 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($DEVELOPER_DIR)" >&5
1.3407 -$as_echo "yes ($DEVELOPER_DIR)" >&6; }
1.3408 - else
1.3409 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.3410 -$as_echo "no" >&6; }
1.3411 - fi
1.3412 -
1.3413 -
1.3414 - # Extract the first word of "xcodebuild", so it can be a program name with args.
1.3415 -set dummy xcodebuild; ac_word=$2
1.3416 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.3417 -$as_echo_n "checking for $ac_word... " >&6; }
1.3418 -if ${ac_cv_path_XCODEBUILD+:} false; then :
1.3419 - $as_echo_n "(cached) " >&6
1.3420 -else
1.3421 - case $XCODEBUILD in
1.3422 - [\\/]* | ?:[\\/]*)
1.3423 - ac_cv_path_XCODEBUILD="$XCODEBUILD" # Let the user override the test with a path.
1.3424 - ;;
1.3425 - *)
1.3426 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.3427 -for as_dir in $PATH
1.3428 -do
1.3429 - IFS=$as_save_IFS
1.3430 - test -z "$as_dir" && as_dir=.
1.3431 - for ac_exec_ext in '' $ac_executable_extensions; do
1.3432 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.3433 - ac_cv_path_XCODEBUILD="$as_dir/$ac_word$ac_exec_ext"
1.3434 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.3435 - break 2
1.3436 - fi
1.3437 -done
1.3438 - done
1.3439 -IFS=$as_save_IFS
1.3440 -
1.3441 - ;;
1.3442 -esac
1.3443 -fi
1.3444 -XCODEBUILD=$ac_cv_path_XCODEBUILD
1.3445 -if test -n "$XCODEBUILD"; then
1.3446 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XCODEBUILD" >&5
1.3447 -$as_echo "$XCODEBUILD" >&6; }
1.3448 -else
1.3449 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.3450 -$as_echo "no" >&6; }
1.3451 -fi
1.3452 -
1.3453 -
1.3454 - if test -z "$XCODEBUILD"; then
1.3455 - as_fn_error $? "The xcodebuild tool was not found, the Xcode command line tools are required to build on Mac OS X" "$LINENO" 5
1.3456 - fi
1.3457 -
1.3458 - # Fail-fast: verify we're building on Xcode 4, we cannot build with Xcode 5 or later
1.3459 - XCODE_VERSION=`$XCODEBUILD -version | grep '^Xcode ' | sed 's/Xcode //'`
1.3460 - XC_VERSION_PARTS=( ${XCODE_VERSION//./ } )
1.3461 - if test ! "${XC_VERSION_PARTS[0]}" = "4"; then
1.3462 - as_fn_error $? "Xcode 4 is required to build JDK 8, the version found was $XCODE_VERSION. Use --with-xcode-path to specify the location of Xcode 4 or make Xcode 4 active by using xcode-select." "$LINENO" 5
1.3463 - fi
1.3464 -
1.3465 - # Some versions of Xcode 5 command line tools install gcc and g++ as symlinks to
1.3466 - # clang and clang++, which will break the build. So handle that here if we need to.
1.3467 - if test -L "/usr/bin/gcc" -o -L "/usr/bin/g++"; then
1.3468 - # use xcrun to find the real gcc and add it's directory to PATH
1.3469 - # then autoconf magic will find it
1.3470 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found gcc symlinks to clang in /usr/bin, adding path to real gcc to PATH" >&5
1.3471 -$as_echo "$as_me: Found gcc symlinks to clang in /usr/bin, adding path to real gcc to PATH" >&6;}
1.3472 - XCODE_BIN_PATH=$(dirname `xcrun -find gcc`)
1.3473 - PATH="$XCODE_BIN_PATH":$PATH
1.3474 - fi
1.3475 -
1.3476 - # Determine appropriate SDKPATH, don't use SDKROOT as it interferes with the stub tools
1.3477 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Determining Xcode SDK path" >&5
1.3478 -$as_echo_n "checking Determining Xcode SDK path... " >&6; }
1.3479 - # allow SDKNAME to be set to override the default SDK selection
1.3480 - SDKPATH=`"$XCODEBUILD" -sdk ${SDKNAME:-macosx} -version | grep '^Path: ' | sed 's/Path: //'`
1.3481 - if test -n "$SDKPATH"; then
1.3482 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDKPATH" >&5
1.3483 -$as_echo "$SDKPATH" >&6; }
1.3484 - else
1.3485 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: (none, will use system headers and frameworks)" >&5
1.3486 -$as_echo "(none, will use system headers and frameworks)" >&6; }
1.3487 - fi
1.3488 -
1.3489 -
1.3490 - # Perform a basic sanity test
1.3491 - if test ! -f "$SDKPATH/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h"; then
1.3492 - as_fn_error $? "Unable to find required framework headers, provide a valid path to Xcode 4 using --with-xcode-path" "$LINENO" 5
1.3493 - fi
1.3494 -
1.3495 - # if SDKPATH is non-empty then we need to add -isysroot and -iframework for gcc and g++
1.3496 - if test -n "$SDKPATH"; then
1.3497 - # We need -isysroot <path> and -iframework<path>/System/Library/Frameworks
1.3498 - CFLAGS_JDK="${CFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\""
1.3499 - CXXFLAGS_JDK="${CXXFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\""
1.3500 - LDFLAGS_JDK="${LDFLAGS_JDK} -isysroot \"$SDKPATH\" -iframework\"$SDKPATH/System/Library/Frameworks\""
1.3501 - fi
1.3502 -
1.3503 - # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework
1.3504 - # setting this here means it doesn't have to be peppered throughout the forest
1.3505 - CFLAGS_JDK="$CFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
1.3506 - CXXFLAGS_JDK="$CXXFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
1.3507 - LDFLAGS_JDK="$LDFLAGS_JDK -F\"$SDKPATH/System/Library/Frameworks/JavaVM.framework/Frameworks\""
1.3508 - fi
1.3509 -
1.3510 - ### Locate C compiler (CC)
1.3511 -
1.3512 - # On windows, only cl.exe is supported.
1.3513 - # On Solaris, cc is preferred to gcc.
1.3514 - # Elsewhere, gcc is preferred to cc.
1.3515 +
1.3516 + #
1.3517 + # Setup the compilers (CC and CXX)
1.3518 + #
1.3519 +
1.3520 + COMPILER_NAME=C
1.3521 + SEARCH_LIST="$TOOLCHAIN_CC_BINARY"
1.3522
1.3523 if test "x$CC" != x; then
1.3524 - COMPILER_CHECK_LIST="$CC"
1.3525 - elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.3526 - COMPILER_CHECK_LIST="cl"
1.3527 - elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
1.3528 - COMPILER_CHECK_LIST="cc gcc"
1.3529 - elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
1.3530 - # Do not probe for cc on AIX.
1.3531 - COMPILER_CHECK_LIST="xlc_r"
1.3532 - else
1.3533 - COMPILER_CHECK_LIST="gcc cc"
1.3534 - fi
1.3535 -
1.3536 -
1.3537 - COMPILER_NAME=C
1.3538 -
1.3539 - CC=
1.3540 - # If TOOLS_DIR is set, check for all compiler names in there first
1.3541 - # before checking the rest of the PATH.
1.3542 - if test -n "$TOOLS_DIR"; then
1.3543 - PATH_save="$PATH"
1.3544 - PATH="$TOOLS_DIR"
1.3545 - for ac_prog in $COMPILER_CHECK_LIST
1.3546 + # User has supplied compiler name already, always let that override.
1.3547 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied compiler CC=$CC" >&5
1.3548 +$as_echo "$as_me: Will use user supplied compiler CC=$CC" >&6;}
1.3549 + if test "x`basename $CC`" = "x$CC"; then
1.3550 + # A command without a complete path is provided, search $PATH.
1.3551 +
1.3552 + for ac_prog in $CC
1.3553 +do
1.3554 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.3555 +set dummy $ac_prog; ac_word=$2
1.3556 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.3557 +$as_echo_n "checking for $ac_word... " >&6; }
1.3558 +if ${ac_cv_path_POTENTIAL_CC+:} false; then :
1.3559 + $as_echo_n "(cached) " >&6
1.3560 +else
1.3561 + case $POTENTIAL_CC in
1.3562 + [\\/]* | ?:[\\/]*)
1.3563 + ac_cv_path_POTENTIAL_CC="$POTENTIAL_CC" # Let the user override the test with a path.
1.3564 + ;;
1.3565 + *)
1.3566 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.3567 +for as_dir in $PATH
1.3568 +do
1.3569 + IFS=$as_save_IFS
1.3570 + test -z "$as_dir" && as_dir=.
1.3571 + for ac_exec_ext in '' $ac_executable_extensions; do
1.3572 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.3573 + ac_cv_path_POTENTIAL_CC="$as_dir/$ac_word$ac_exec_ext"
1.3574 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.3575 + break 2
1.3576 + fi
1.3577 +done
1.3578 + done
1.3579 +IFS=$as_save_IFS
1.3580 +
1.3581 + ;;
1.3582 +esac
1.3583 +fi
1.3584 +POTENTIAL_CC=$ac_cv_path_POTENTIAL_CC
1.3585 +if test -n "$POTENTIAL_CC"; then
1.3586 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POTENTIAL_CC" >&5
1.3587 +$as_echo "$POTENTIAL_CC" >&6; }
1.3588 +else
1.3589 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.3590 +$as_echo "no" >&6; }
1.3591 +fi
1.3592 +
1.3593 +
1.3594 + test -n "$POTENTIAL_CC" && break
1.3595 +done
1.3596 +
1.3597 + if test "x$POTENTIAL_CC" != x; then
1.3598 + CC=$POTENTIAL_CC
1.3599 + else
1.3600 + as_fn_error $? "User supplied compiler CC=$CC could not be found" "$LINENO" 5
1.3601 + fi
1.3602 + else
1.3603 + # Otherwise it might already be a complete path
1.3604 + if test ! -x "$CC"; then
1.3605 + as_fn_error $? "User supplied compiler CC=$CC does not exist" "$LINENO" 5
1.3606 + fi
1.3607 + fi
1.3608 + else
1.3609 + # No user supplied value. Locate compiler ourselves.
1.3610 +
1.3611 + # If we are cross compiling, assume cross compilation tools follows the
1.3612 + # cross compilation standard where they are prefixed with the autoconf
1.3613 + # standard name for the target. For example the binary
1.3614 + # i686-sun-solaris2.10-gcc will cross compile for i686-sun-solaris2.10.
1.3615 + # If we are not cross compiling, then the default compiler name will be
1.3616 + # used.
1.3617 +
1.3618 + CC=
1.3619 + # If TOOLS_DIR is set, check for all compiler names in there first
1.3620 + # before checking the rest of the PATH.
1.3621 + # FIXME: Now that we prefix the TOOLS_DIR to the PATH in the PRE_DETECTION
1.3622 + # step, this should not be necessary.
1.3623 + if test -n "$TOOLS_DIR"; then
1.3624 + PATH_save="$PATH"
1.3625 + PATH="$TOOLS_DIR"
1.3626 + for ac_prog in $TOOLCHAIN_CC_BINARY
1.3627 do
1.3628 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.3629 set dummy $ac_prog; ac_word=$2
1.3630 @@ -28049,14 +26175,14 @@
1.3631 test -n "$TOOLS_DIR_CC" && break
1.3632 done
1.3633
1.3634 - CC=$TOOLS_DIR_CC
1.3635 - PATH="$PATH_save"
1.3636 - fi
1.3637 -
1.3638 - # AC_PATH_PROGS can't be run multiple times with the same variable,
1.3639 - # so create a new name for this run.
1.3640 - if test "x$CC" = x; then
1.3641 - for ac_prog in $COMPILER_CHECK_LIST
1.3642 + CC=$TOOLS_DIR_CC
1.3643 + PATH="$PATH_save"
1.3644 + fi
1.3645 +
1.3646 + # AC_PATH_PROGS can't be run multiple times with the same variable,
1.3647 + # so create a new name for this run.
1.3648 + if test "x$CC" = x; then
1.3649 + for ac_prog in $TOOLCHAIN_CC_BINARY
1.3650 do
1.3651 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.3652 set dummy $ac_prog; ac_word=$2
1.3653 @@ -28101,10 +26227,10 @@
1.3654 test -n "$POTENTIAL_CC" && break
1.3655 done
1.3656
1.3657 - CC=$POTENTIAL_CC
1.3658 - fi
1.3659 -
1.3660 - if test "x$CC" = x; then
1.3661 + CC=$POTENTIAL_CC
1.3662 + fi
1.3663 +
1.3664 + if test "x$CC" = x; then
1.3665
1.3666 # Print a helpful message on how to acquire the necessary build dependency.
1.3667 # devkit is the help tag: freetype, cups, pulse, alsa etc
1.3668 @@ -28135,8 +26261,11 @@
1.3669 fi
1.3670 fi
1.3671
1.3672 - as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5
1.3673 - fi
1.3674 + as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5
1.3675 + fi
1.3676 + fi
1.3677 +
1.3678 + # Now we have a compiler binary in CC. Make sure it's okay.
1.3679
1.3680 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.3681
1.3682 @@ -28373,8 +26502,7 @@
1.3683 done
1.3684 IFS="$IFS_save"
1.3685 else
1.3686 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CC (as $path) failed, using $path directly." >&5
1.3687 -$as_echo "$as_me: Resolving CC (as $path) failed, using $path directly." >&6;}
1.3688 + # This is an absolute path, we can use it without further modifications.
1.3689 new_path="$path"
1.3690 fi
1.3691
1.3692 @@ -28407,6 +26535,7 @@
1.3693 # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links
1.3694 # to 'xlc' but it is crucial that we invoke the compiler with the right name!
1.3695 if test "x$OPENJDK_BUILD_OS" != xaix; then
1.3696 + # FIXME: This test should not be needed anymore; we don't do that for any platform.
1.3697 { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CC" >&5
1.3698 $as_echo_n "checking resolved symbolic links for CC... " >&6; }
1.3699
1.3700 @@ -28478,7 +26607,7 @@
1.3701
1.3702 # Try again looking for our compiler
1.3703 if test -n "$ac_tool_prefix"; then
1.3704 - for ac_prog in $COMPILER_CHECK_LIST
1.3705 + for ac_prog in $TOOLCHAIN_CC_BINARY
1.3706 do
1.3707 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.3708 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.3709 @@ -28522,7 +26651,7 @@
1.3710 fi
1.3711 if test -z "$PROPER_COMPILER_CC"; then
1.3712 ac_ct_PROPER_COMPILER_CC=$PROPER_COMPILER_CC
1.3713 - for ac_prog in $COMPILER_CHECK_LIST
1.3714 + for ac_prog in $TOOLCHAIN_CC_BINARY
1.3715 do
1.3716 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.3717 set dummy $ac_prog; ac_word=$2
1.3718 @@ -28813,8 +26942,7 @@
1.3719 done
1.3720 IFS="$IFS_save"
1.3721 else
1.3722 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving PROPER_COMPILER_CC (as $path) failed, using $path directly." >&5
1.3723 -$as_echo "$as_me: Resolving PROPER_COMPILER_CC (as $path) failed, using $path directly." >&6;}
1.3724 + # This is an absolute path, we can use it without further modifications.
1.3725 new_path="$path"
1.3726 fi
1.3727
1.3728 @@ -28904,75 +27032,126 @@
1.3729 CC="$TEST_COMPILER"
1.3730 fi
1.3731
1.3732 +
1.3733 COMPILER=$CC
1.3734 COMPILER_NAME=$COMPILER_NAME
1.3735
1.3736 - if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.3737 - # Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
1.3738 - COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
1.3739 - $ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
1.3740 + if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
1.3741 + # cc -V output typically looks like
1.3742 + # cc: Sun C 5.12 Linux_i386 2011/11/16
1.3743 + COMPILER_VERSION_OUTPUT=`$COMPILER -V 2>&1`
1.3744 + # Check that this is likely to be the Solaris Studio cc.
1.3745 + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
1.3746 if test $? -ne 0; then
1.3747 - GCC_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
1.3748 -
1.3749 - { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required Sun Studio compiler." >&5
1.3750 -$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required Sun Studio compiler." >&6;}
1.3751 - { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with -V was: \"$COMPILER_VERSION_TEST\" and with --version: \"$GCC_VERSION_TEST\"" >&5
1.3752 -$as_echo "$as_me: The result from running with -V was: \"$COMPILER_VERSION_TEST\" and with --version: \"$GCC_VERSION_TEST\"" >&6;}
1.3753 - as_fn_error $? "Sun Studio compiler is required. Try setting --with-tools-dir." "$LINENO" 5
1.3754 - else
1.3755 - COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p"`
1.3756 - COMPILER_VENDOR="Sun Studio"
1.3757 - fi
1.3758 - elif test "x$OPENJDK_TARGET_OS" = xaix; then
1.3759 - COMPILER_VERSION_TEST=`$COMPILER -qversion 2>&1 | $TAIL -n 1`
1.3760 - $ECHO $COMPILER_VERSION_TEST | $GREP "^Version: " > /dev/null
1.3761 - if test $? -ne 0; then
1.3762 - as_fn_error $? "Failed to detect the compiler version of $COMPILER ...." "$LINENO" 5
1.3763 - else
1.3764 - COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n 's/Version: \(0-90-9\.0-90-9*\).*/\1/p'`
1.3765 - COMPILER_VENDOR='IBM'
1.3766 - fi
1.3767 - elif test "x$OPENJDK_TARGET_OS" = xwindows; then
1.3768 + ALT_VERSION_OUTPUT=`$COMPILER --version 2>&1`
1.3769 + { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&5
1.3770 +$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&6;}
1.3771 + { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with -V was: \"$COMPILER_VERSION_OUTPUT\"" >&5
1.3772 +$as_echo "$as_me: The result from running with -V was: \"$COMPILER_VERSION_OUTPUT\"" >&6;}
1.3773 + { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with --version was: \"$ALT_VERSION_OUTPUT\"" >&5
1.3774 +$as_echo "$as_me: The result from running with --version was: \"$ALT_VERSION_OUTPUT\"" >&6;}
1.3775 + as_fn_error $? "A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir." "$LINENO" 5
1.3776 + fi
1.3777 + # Remove usage instructions (if present), and
1.3778 + # collapse compiler output into a single line
1.3779 + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.3780 + $SED -e 's/ *[Uu]sage:.*//'`
1.3781 + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.3782 + $SED -e "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/"`
1.3783 + elif test "x$TOOLCHAIN_TYPE" = xxlc; then
1.3784 + # xlc -qversion output typically looks like
1.3785 + # IBM XL C/C++ for AIX, V11.1 (5724-X13)
1.3786 + # Version: 11.01.0000.0015
1.3787 + COMPILER_VERSION_OUTPUT=`$COMPILER -qversion 2>&1`
1.3788 + # Check that this is likely to be the IBM XL C compiler.
1.3789 + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "IBM XL C" > /dev/null
1.3790 + if test $? -ne 0; then
1.3791 + ALT_VERSION_OUTPUT=`$COMPILER --version 2>&1`
1.3792 + { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&5
1.3793 +$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&6;}
1.3794 + { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with -qversion was: \"$COMPILER_VERSION_OUTPUT\"" >&5
1.3795 +$as_echo "$as_me: The result from running with -qversion was: \"$COMPILER_VERSION_OUTPUT\"" >&6;}
1.3796 + { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with --version was: \"$ALT_VERSION_OUTPUT\"" >&5
1.3797 +$as_echo "$as_me: The result from running with --version was: \"$ALT_VERSION_OUTPUT\"" >&6;}
1.3798 + as_fn_error $? "A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir." "$LINENO" 5
1.3799 + fi
1.3800 + # Collapse compiler output into a single line
1.3801 + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT`
1.3802 + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.3803 + $SED -e 's/^.*, V\([1-9][0-9.]*\).*$/\1/'`
1.3804 + elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.3805 + # There is no specific version flag, but all output starts with a version string.
1.3806 # First line typically looks something like:
1.3807 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86
1.3808 - COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
1.3809 - COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"`
1.3810 - COMPILER_VENDOR="Microsoft CL.EXE"
1.3811 - COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`
1.3812 - if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
1.3813 - if test "x$COMPILER_CPU_TEST" != "x80x86"; then
1.3814 - as_fn_error $? "Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for \"$COMPILER_CPU_TEST\"; expected \"80x86\"." "$LINENO" 5
1.3815 - fi
1.3816 - elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
1.3817 - if test "x$COMPILER_CPU_TEST" != "xx64"; then
1.3818 - as_fn_error $? "Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for \"$COMPILER_CPU_TEST\"; expected \"x64\"." "$LINENO" 5
1.3819 - fi
1.3820 - fi
1.3821 - else
1.3822 - COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
1.3823 + COMPILER_VERSION_OUTPUT=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
1.3824 + # Check that this is likely to be Microsoft CL.EXE.
1.3825 + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Microsoft.*Compiler" > /dev/null
1.3826 + if test $? -ne 0; then
1.3827 + { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&5
1.3828 +$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&6;}
1.3829 + { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running it was: \"$COMPILER_VERSION_OUTPUT\"" >&5
1.3830 +$as_echo "$as_me: The result from running it was: \"$COMPILER_VERSION_OUTPUT\"" >&6;}
1.3831 + as_fn_error $? "A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir." "$LINENO" 5
1.3832 + fi
1.3833 + # Collapse compiler output into a single line
1.3834 + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT`
1.3835 + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.3836 + $SED -e 's/^.*ersion.\([1-9][0-9.]*\) .*$/\1/'`
1.3837 + elif test "x$TOOLCHAIN_TYPE" = xgcc; then
1.3838 + # gcc --version output typically looks like
1.3839 + # gcc (Ubuntu/Linaro 4.8.1-10ubuntu9) 4.8.1
1.3840 + # Copyright (C) 2013 Free Software Foundation, Inc.
1.3841 + # This is free software; see the source for copying conditions. There is NO
1.3842 + # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1.3843 + COMPILER_VERSION_OUTPUT=`$COMPILER --version 2>&1`
1.3844 # Check that this is likely to be GCC.
1.3845 - $COMPILER --version 2>&1 | $GREP "Free Software Foundation" > /dev/null
1.3846 + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Free Software Foundation" > /dev/null
1.3847 if test $? -ne 0; then
1.3848 - { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&5
1.3849 -$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&6;}
1.3850 - { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with --version was: \"$COMPILER_VERSION_TEST\"" >&5
1.3851 -$as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSION_TEST\"" >&6;}
1.3852 - as_fn_error $? "GCC compiler is required. Try setting --with-tools-dir." "$LINENO" 5
1.3853 - fi
1.3854 -
1.3855 - # First line typically looks something like:
1.3856 - # gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2
1.3857 - COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | \
1.3858 - $SED -e 's/^.* \([1-9]\.[0-9.]*\)[^0-9.].*$/\1/'`
1.3859 - COMPILER_VENDOR=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^\(.*\) [1-9][0-9.]*/\1/p"`
1.3860 - fi
1.3861 - # This sets CC_VERSION or CXX_VERSION. (This comment is a grep marker)
1.3862 - CC_VERSION="$COMPILER_VERSION"
1.3863 - # This sets CC_VENDOR or CXX_VENDOR. (This comment is a grep marker)
1.3864 - CC_VENDOR="$COMPILER_VENDOR"
1.3865 -
1.3866 - { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5
1.3867 -$as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;}
1.3868 + { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&5
1.3869 +$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&6;}
1.3870 + { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with --version was: \"$COMPILER_VERSION\"" >&5
1.3871 +$as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSION\"" >&6;}
1.3872 + as_fn_error $? "A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir." "$LINENO" 5
1.3873 + fi
1.3874 + # Remove Copyright and legalese from version string, and
1.3875 + # collapse into a single line
1.3876 + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.3877 + $SED -e 's/ *Copyright .*//'`
1.3878 + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.3879 + $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'`
1.3880 + elif test "x$TOOLCHAIN_TYPE" = xclang; then
1.3881 + # clang --version output typically looks like
1.3882 + # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
1.3883 + # clang version 3.3 (tags/RELEASE_33/final)
1.3884 + # or
1.3885 + # Debian clang version 3.2-7ubuntu1 (tags/RELEASE_32/final) (based on LLVM 3.2)
1.3886 + # Target: x86_64-pc-linux-gnu
1.3887 + # Thread model: posix
1.3888 + COMPILER_VERSION_OUTPUT=`$COMPILER --version 2>&1`
1.3889 + # Check that this is likely to be clang
1.3890 + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "clang" > /dev/null
1.3891 + if test $? -ne 0; then
1.3892 + { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&5
1.3893 +$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&6;}
1.3894 + { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with --version was: \"$COMPILER_VERSION_OUTPUT\"" >&5
1.3895 +$as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSION_OUTPUT\"" >&6;}
1.3896 + as_fn_error $? "A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir." "$LINENO" 5
1.3897 + fi
1.3898 + # Collapse compiler output into a single line
1.3899 + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT`
1.3900 + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.3901 + $SED -e 's/^.*clang version \([1-9][0-9.]*\).*$/\1/'`
1.3902 +
1.3903 + else
1.3904 + as_fn_error $? "Unknown toolchain type $TOOLCHAIN_TYPE." "$LINENO" 5
1.3905 + fi
1.3906 + # This sets CC_VERSION_NUMBER or CXX_VERSION_NUMBER. (This comment is a grep marker)
1.3907 + CC_VERSION_NUMBER="$COMPILER_VERSION_NUMBER"
1.3908 + # This sets CC_VERSION_STRING or CXX_VERSION_STRING. (This comment is a grep marker)
1.3909 + CC_VERSION_STRING="$COMPILER_VERSION_STRING"
1.3910 +
1.3911 + { $as_echo "$as_me:${as_lineno-$LINENO}: Using $TOOLCHAIN_TYPE $COMPILER_NAME compiler version $COMPILER_VERSION_NUMBER [$COMPILER_VERSION_STRING]" >&5
1.3912 +$as_echo "$as_me: Using $TOOLCHAIN_TYPE $COMPILER_NAME compiler version $COMPILER_VERSION_NUMBER [$COMPILER_VERSION_STRING]" >&6;}
1.3913
1.3914
1.3915 # Now that we have resolved CC ourself, let autoconf have its go at it
1.3916 @@ -29574,39 +27753,92 @@
1.3917 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1.3918
1.3919
1.3920 - # Option used to tell the compiler whether to create 32- or 64-bit executables
1.3921 - # Notice that CC contains the full compiler path at this point.
1.3922 - case $CC in
1.3923 - *xlc_r) COMPILER_TARGET_BITS_FLAG="-q";;
1.3924 - *) COMPILER_TARGET_BITS_FLAG="-m";;
1.3925 - esac
1.3926 -
1.3927 -
1.3928 - ### Locate C++ compiler (CXX)
1.3929 +
1.3930 + COMPILER_NAME=C++
1.3931 + SEARCH_LIST="$TOOLCHAIN_CXX_BINARY"
1.3932
1.3933 if test "x$CXX" != x; then
1.3934 - COMPILER_CHECK_LIST="$CXX"
1.3935 - elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.3936 - COMPILER_CHECK_LIST="cl"
1.3937 - elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
1.3938 - COMPILER_CHECK_LIST="CC g++"
1.3939 - elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
1.3940 - # Do not probe for CC on AIX .
1.3941 - COMPILER_CHECK_LIST="xlC_r"
1.3942 - else
1.3943 - COMPILER_CHECK_LIST="g++ CC"
1.3944 - fi
1.3945 -
1.3946 -
1.3947 - COMPILER_NAME=C++
1.3948 -
1.3949 - CXX=
1.3950 - # If TOOLS_DIR is set, check for all compiler names in there first
1.3951 - # before checking the rest of the PATH.
1.3952 - if test -n "$TOOLS_DIR"; then
1.3953 - PATH_save="$PATH"
1.3954 - PATH="$TOOLS_DIR"
1.3955 - for ac_prog in $COMPILER_CHECK_LIST
1.3956 + # User has supplied compiler name already, always let that override.
1.3957 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied compiler CXX=$CXX" >&5
1.3958 +$as_echo "$as_me: Will use user supplied compiler CXX=$CXX" >&6;}
1.3959 + if test "x`basename $CXX`" = "x$CXX"; then
1.3960 + # A command without a complete path is provided, search $PATH.
1.3961 +
1.3962 + for ac_prog in $CXX
1.3963 +do
1.3964 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.3965 +set dummy $ac_prog; ac_word=$2
1.3966 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.3967 +$as_echo_n "checking for $ac_word... " >&6; }
1.3968 +if ${ac_cv_path_POTENTIAL_CXX+:} false; then :
1.3969 + $as_echo_n "(cached) " >&6
1.3970 +else
1.3971 + case $POTENTIAL_CXX in
1.3972 + [\\/]* | ?:[\\/]*)
1.3973 + ac_cv_path_POTENTIAL_CXX="$POTENTIAL_CXX" # Let the user override the test with a path.
1.3974 + ;;
1.3975 + *)
1.3976 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.3977 +for as_dir in $PATH
1.3978 +do
1.3979 + IFS=$as_save_IFS
1.3980 + test -z "$as_dir" && as_dir=.
1.3981 + for ac_exec_ext in '' $ac_executable_extensions; do
1.3982 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.3983 + ac_cv_path_POTENTIAL_CXX="$as_dir/$ac_word$ac_exec_ext"
1.3984 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.3985 + break 2
1.3986 + fi
1.3987 +done
1.3988 + done
1.3989 +IFS=$as_save_IFS
1.3990 +
1.3991 + ;;
1.3992 +esac
1.3993 +fi
1.3994 +POTENTIAL_CXX=$ac_cv_path_POTENTIAL_CXX
1.3995 +if test -n "$POTENTIAL_CXX"; then
1.3996 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POTENTIAL_CXX" >&5
1.3997 +$as_echo "$POTENTIAL_CXX" >&6; }
1.3998 +else
1.3999 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.4000 +$as_echo "no" >&6; }
1.4001 +fi
1.4002 +
1.4003 +
1.4004 + test -n "$POTENTIAL_CXX" && break
1.4005 +done
1.4006 +
1.4007 + if test "x$POTENTIAL_CXX" != x; then
1.4008 + CXX=$POTENTIAL_CXX
1.4009 + else
1.4010 + as_fn_error $? "User supplied compiler CXX=$CXX could not be found" "$LINENO" 5
1.4011 + fi
1.4012 + else
1.4013 + # Otherwise it might already be a complete path
1.4014 + if test ! -x "$CXX"; then
1.4015 + as_fn_error $? "User supplied compiler CXX=$CXX does not exist" "$LINENO" 5
1.4016 + fi
1.4017 + fi
1.4018 + else
1.4019 + # No user supplied value. Locate compiler ourselves.
1.4020 +
1.4021 + # If we are cross compiling, assume cross compilation tools follows the
1.4022 + # cross compilation standard where they are prefixed with the autoconf
1.4023 + # standard name for the target. For example the binary
1.4024 + # i686-sun-solaris2.10-gcc will cross compile for i686-sun-solaris2.10.
1.4025 + # If we are not cross compiling, then the default compiler name will be
1.4026 + # used.
1.4027 +
1.4028 + CXX=
1.4029 + # If TOOLS_DIR is set, check for all compiler names in there first
1.4030 + # before checking the rest of the PATH.
1.4031 + # FIXME: Now that we prefix the TOOLS_DIR to the PATH in the PRE_DETECTION
1.4032 + # step, this should not be necessary.
1.4033 + if test -n "$TOOLS_DIR"; then
1.4034 + PATH_save="$PATH"
1.4035 + PATH="$TOOLS_DIR"
1.4036 + for ac_prog in $TOOLCHAIN_CXX_BINARY
1.4037 do
1.4038 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.4039 set dummy $ac_prog; ac_word=$2
1.4040 @@ -29651,14 +27883,14 @@
1.4041 test -n "$TOOLS_DIR_CXX" && break
1.4042 done
1.4043
1.4044 - CXX=$TOOLS_DIR_CXX
1.4045 - PATH="$PATH_save"
1.4046 - fi
1.4047 -
1.4048 - # AC_PATH_PROGS can't be run multiple times with the same variable,
1.4049 - # so create a new name for this run.
1.4050 - if test "x$CXX" = x; then
1.4051 - for ac_prog in $COMPILER_CHECK_LIST
1.4052 + CXX=$TOOLS_DIR_CXX
1.4053 + PATH="$PATH_save"
1.4054 + fi
1.4055 +
1.4056 + # AC_PATH_PROGS can't be run multiple times with the same variable,
1.4057 + # so create a new name for this run.
1.4058 + if test "x$CXX" = x; then
1.4059 + for ac_prog in $TOOLCHAIN_CXX_BINARY
1.4060 do
1.4061 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.4062 set dummy $ac_prog; ac_word=$2
1.4063 @@ -29703,10 +27935,10 @@
1.4064 test -n "$POTENTIAL_CXX" && break
1.4065 done
1.4066
1.4067 - CXX=$POTENTIAL_CXX
1.4068 - fi
1.4069 -
1.4070 - if test "x$CXX" = x; then
1.4071 + CXX=$POTENTIAL_CXX
1.4072 + fi
1.4073 +
1.4074 + if test "x$CXX" = x; then
1.4075
1.4076 # Print a helpful message on how to acquire the necessary build dependency.
1.4077 # devkit is the help tag: freetype, cups, pulse, alsa etc
1.4078 @@ -29737,8 +27969,11 @@
1.4079 fi
1.4080 fi
1.4081
1.4082 - as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5
1.4083 - fi
1.4084 + as_fn_error $? "Could not find a $COMPILER_NAME compiler. $HELP_MSG" "$LINENO" 5
1.4085 + fi
1.4086 + fi
1.4087 +
1.4088 + # Now we have a compiler binary in CXX. Make sure it's okay.
1.4089
1.4090 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.4091
1.4092 @@ -29975,8 +28210,7 @@
1.4093 done
1.4094 IFS="$IFS_save"
1.4095 else
1.4096 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CXX (as $path) failed, using $path directly." >&5
1.4097 -$as_echo "$as_me: Resolving CXX (as $path) failed, using $path directly." >&6;}
1.4098 + # This is an absolute path, we can use it without further modifications.
1.4099 new_path="$path"
1.4100 fi
1.4101
1.4102 @@ -30009,6 +28243,7 @@
1.4103 # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r' may all be links
1.4104 # to 'xlc' but it is crucial that we invoke the compiler with the right name!
1.4105 if test "x$OPENJDK_BUILD_OS" != xaix; then
1.4106 + # FIXME: This test should not be needed anymore; we don't do that for any platform.
1.4107 { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CXX" >&5
1.4108 $as_echo_n "checking resolved symbolic links for CXX... " >&6; }
1.4109
1.4110 @@ -30080,7 +28315,7 @@
1.4111
1.4112 # Try again looking for our compiler
1.4113 if test -n "$ac_tool_prefix"; then
1.4114 - for ac_prog in $COMPILER_CHECK_LIST
1.4115 + for ac_prog in $TOOLCHAIN_CXX_BINARY
1.4116 do
1.4117 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.4118 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.4119 @@ -30124,7 +28359,7 @@
1.4120 fi
1.4121 if test -z "$PROPER_COMPILER_CXX"; then
1.4122 ac_ct_PROPER_COMPILER_CXX=$PROPER_COMPILER_CXX
1.4123 - for ac_prog in $COMPILER_CHECK_LIST
1.4124 + for ac_prog in $TOOLCHAIN_CXX_BINARY
1.4125 do
1.4126 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.4127 set dummy $ac_prog; ac_word=$2
1.4128 @@ -30415,8 +28650,7 @@
1.4129 done
1.4130 IFS="$IFS_save"
1.4131 else
1.4132 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving PROPER_COMPILER_CXX (as $path) failed, using $path directly." >&5
1.4133 -$as_echo "$as_me: Resolving PROPER_COMPILER_CXX (as $path) failed, using $path directly." >&6;}
1.4134 + # This is an absolute path, we can use it without further modifications.
1.4135 new_path="$path"
1.4136 fi
1.4137
1.4138 @@ -30506,75 +28740,126 @@
1.4139 CXX="$TEST_COMPILER"
1.4140 fi
1.4141
1.4142 +
1.4143 COMPILER=$CXX
1.4144 COMPILER_NAME=$COMPILER_NAME
1.4145
1.4146 - if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.4147 - # Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
1.4148 - COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
1.4149 - $ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
1.4150 + if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
1.4151 + # cc -V output typically looks like
1.4152 + # cc: Sun C 5.12 Linux_i386 2011/11/16
1.4153 + COMPILER_VERSION_OUTPUT=`$COMPILER -V 2>&1`
1.4154 + # Check that this is likely to be the Solaris Studio cc.
1.4155 + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
1.4156 if test $? -ne 0; then
1.4157 - GCC_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
1.4158 -
1.4159 - { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required Sun Studio compiler." >&5
1.4160 -$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required Sun Studio compiler." >&6;}
1.4161 - { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with -V was: \"$COMPILER_VERSION_TEST\" and with --version: \"$GCC_VERSION_TEST\"" >&5
1.4162 -$as_echo "$as_me: The result from running with -V was: \"$COMPILER_VERSION_TEST\" and with --version: \"$GCC_VERSION_TEST\"" >&6;}
1.4163 - as_fn_error $? "Sun Studio compiler is required. Try setting --with-tools-dir." "$LINENO" 5
1.4164 - else
1.4165 - COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p"`
1.4166 - COMPILER_VENDOR="Sun Studio"
1.4167 - fi
1.4168 - elif test "x$OPENJDK_TARGET_OS" = xaix; then
1.4169 - COMPILER_VERSION_TEST=`$COMPILER -qversion 2>&1 | $TAIL -n 1`
1.4170 - $ECHO $COMPILER_VERSION_TEST | $GREP "^Version: " > /dev/null
1.4171 - if test $? -ne 0; then
1.4172 - as_fn_error $? "Failed to detect the compiler version of $COMPILER ...." "$LINENO" 5
1.4173 - else
1.4174 - COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n 's/Version: \(0-90-9\.0-90-9*\).*/\1/p'`
1.4175 - COMPILER_VENDOR='IBM'
1.4176 - fi
1.4177 - elif test "x$OPENJDK_TARGET_OS" = xwindows; then
1.4178 + ALT_VERSION_OUTPUT=`$COMPILER --version 2>&1`
1.4179 + { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&5
1.4180 +$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&6;}
1.4181 + { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with -V was: \"$COMPILER_VERSION_OUTPUT\"" >&5
1.4182 +$as_echo "$as_me: The result from running with -V was: \"$COMPILER_VERSION_OUTPUT\"" >&6;}
1.4183 + { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with --version was: \"$ALT_VERSION_OUTPUT\"" >&5
1.4184 +$as_echo "$as_me: The result from running with --version was: \"$ALT_VERSION_OUTPUT\"" >&6;}
1.4185 + as_fn_error $? "A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir." "$LINENO" 5
1.4186 + fi
1.4187 + # Remove usage instructions (if present), and
1.4188 + # collapse compiler output into a single line
1.4189 + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.4190 + $SED -e 's/ *[Uu]sage:.*//'`
1.4191 + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.4192 + $SED -e "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/"`
1.4193 + elif test "x$TOOLCHAIN_TYPE" = xxlc; then
1.4194 + # xlc -qversion output typically looks like
1.4195 + # IBM XL C/C++ for AIX, V11.1 (5724-X13)
1.4196 + # Version: 11.01.0000.0015
1.4197 + COMPILER_VERSION_OUTPUT=`$COMPILER -qversion 2>&1`
1.4198 + # Check that this is likely to be the IBM XL C compiler.
1.4199 + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "IBM XL C" > /dev/null
1.4200 + if test $? -ne 0; then
1.4201 + ALT_VERSION_OUTPUT=`$COMPILER --version 2>&1`
1.4202 + { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&5
1.4203 +$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&6;}
1.4204 + { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with -qversion was: \"$COMPILER_VERSION_OUTPUT\"" >&5
1.4205 +$as_echo "$as_me: The result from running with -qversion was: \"$COMPILER_VERSION_OUTPUT\"" >&6;}
1.4206 + { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with --version was: \"$ALT_VERSION_OUTPUT\"" >&5
1.4207 +$as_echo "$as_me: The result from running with --version was: \"$ALT_VERSION_OUTPUT\"" >&6;}
1.4208 + as_fn_error $? "A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir." "$LINENO" 5
1.4209 + fi
1.4210 + # Collapse compiler output into a single line
1.4211 + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT`
1.4212 + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.4213 + $SED -e 's/^.*, V\([1-9][0-9.]*\).*$/\1/'`
1.4214 + elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.4215 + # There is no specific version flag, but all output starts with a version string.
1.4216 # First line typically looks something like:
1.4217 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86
1.4218 - COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
1.4219 - COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"`
1.4220 - COMPILER_VENDOR="Microsoft CL.EXE"
1.4221 - COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`
1.4222 - if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
1.4223 - if test "x$COMPILER_CPU_TEST" != "x80x86"; then
1.4224 - as_fn_error $? "Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for \"$COMPILER_CPU_TEST\"; expected \"80x86\"." "$LINENO" 5
1.4225 - fi
1.4226 - elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
1.4227 - if test "x$COMPILER_CPU_TEST" != "xx64"; then
1.4228 - as_fn_error $? "Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for \"$COMPILER_CPU_TEST\"; expected \"x64\"." "$LINENO" 5
1.4229 - fi
1.4230 - fi
1.4231 - else
1.4232 - COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
1.4233 + COMPILER_VERSION_OUTPUT=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
1.4234 + # Check that this is likely to be Microsoft CL.EXE.
1.4235 + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Microsoft.*Compiler" > /dev/null
1.4236 + if test $? -ne 0; then
1.4237 + { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&5
1.4238 +$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&6;}
1.4239 + { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running it was: \"$COMPILER_VERSION_OUTPUT\"" >&5
1.4240 +$as_echo "$as_me: The result from running it was: \"$COMPILER_VERSION_OUTPUT\"" >&6;}
1.4241 + as_fn_error $? "A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir." "$LINENO" 5
1.4242 + fi
1.4243 + # Collapse compiler output into a single line
1.4244 + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT`
1.4245 + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.4246 + $SED -e 's/^.*ersion.\([1-9][0-9.]*\) .*$/\1/'`
1.4247 + elif test "x$TOOLCHAIN_TYPE" = xgcc; then
1.4248 + # gcc --version output typically looks like
1.4249 + # gcc (Ubuntu/Linaro 4.8.1-10ubuntu9) 4.8.1
1.4250 + # Copyright (C) 2013 Free Software Foundation, Inc.
1.4251 + # This is free software; see the source for copying conditions. There is NO
1.4252 + # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1.4253 + COMPILER_VERSION_OUTPUT=`$COMPILER --version 2>&1`
1.4254 # Check that this is likely to be GCC.
1.4255 - $COMPILER --version 2>&1 | $GREP "Free Software Foundation" > /dev/null
1.4256 + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Free Software Foundation" > /dev/null
1.4257 if test $? -ne 0; then
1.4258 - { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&5
1.4259 -$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&6;}
1.4260 - { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with --version was: \"$COMPILER_VERSION_TEST\"" >&5
1.4261 -$as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSION_TEST\"" >&6;}
1.4262 - as_fn_error $? "GCC compiler is required. Try setting --with-tools-dir." "$LINENO" 5
1.4263 - fi
1.4264 -
1.4265 - # First line typically looks something like:
1.4266 - # gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2
1.4267 - COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | \
1.4268 - $SED -e 's/^.* \([1-9]\.[0-9.]*\)[^0-9.].*$/\1/'`
1.4269 - COMPILER_VENDOR=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^\(.*\) [1-9][0-9.]*/\1/p"`
1.4270 - fi
1.4271 - # This sets CC_VERSION or CXX_VERSION. (This comment is a grep marker)
1.4272 - CXX_VERSION="$COMPILER_VERSION"
1.4273 - # This sets CC_VENDOR or CXX_VENDOR. (This comment is a grep marker)
1.4274 - CXX_VENDOR="$COMPILER_VENDOR"
1.4275 -
1.4276 - { $as_echo "$as_me:${as_lineno-$LINENO}: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&5
1.4277 -$as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;}
1.4278 + { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&5
1.4279 +$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&6;}
1.4280 + { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with --version was: \"$COMPILER_VERSION\"" >&5
1.4281 +$as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSION\"" >&6;}
1.4282 + as_fn_error $? "A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir." "$LINENO" 5
1.4283 + fi
1.4284 + # Remove Copyright and legalese from version string, and
1.4285 + # collapse into a single line
1.4286 + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.4287 + $SED -e 's/ *Copyright .*//'`
1.4288 + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.4289 + $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'`
1.4290 + elif test "x$TOOLCHAIN_TYPE" = xclang; then
1.4291 + # clang --version output typically looks like
1.4292 + # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
1.4293 + # clang version 3.3 (tags/RELEASE_33/final)
1.4294 + # or
1.4295 + # Debian clang version 3.2-7ubuntu1 (tags/RELEASE_32/final) (based on LLVM 3.2)
1.4296 + # Target: x86_64-pc-linux-gnu
1.4297 + # Thread model: posix
1.4298 + COMPILER_VERSION_OUTPUT=`$COMPILER --version 2>&1`
1.4299 + # Check that this is likely to be clang
1.4300 + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "clang" > /dev/null
1.4301 + if test $? -ne 0; then
1.4302 + { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&5
1.4303 +$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&6;}
1.4304 + { $as_echo "$as_me:${as_lineno-$LINENO}: The result from running with --version was: \"$COMPILER_VERSION_OUTPUT\"" >&5
1.4305 +$as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSION_OUTPUT\"" >&6;}
1.4306 + as_fn_error $? "A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir." "$LINENO" 5
1.4307 + fi
1.4308 + # Collapse compiler output into a single line
1.4309 + COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT`
1.4310 + COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
1.4311 + $SED -e 's/^.*clang version \([1-9][0-9.]*\).*$/\1/'`
1.4312 +
1.4313 + else
1.4314 + as_fn_error $? "Unknown toolchain type $TOOLCHAIN_TYPE." "$LINENO" 5
1.4315 + fi
1.4316 + # This sets CC_VERSION_NUMBER or CXX_VERSION_NUMBER. (This comment is a grep marker)
1.4317 + CXX_VERSION_NUMBER="$COMPILER_VERSION_NUMBER"
1.4318 + # This sets CC_VERSION_STRING or CXX_VERSION_STRING. (This comment is a grep marker)
1.4319 + CXX_VERSION_STRING="$COMPILER_VERSION_STRING"
1.4320 +
1.4321 + { $as_echo "$as_me:${as_lineno-$LINENO}: Using $TOOLCHAIN_TYPE $COMPILER_NAME compiler version $COMPILER_VERSION_NUMBER [$COMPILER_VERSION_STRING]" >&5
1.4322 +$as_echo "$as_me: Using $TOOLCHAIN_TYPE $COMPILER_NAME compiler version $COMPILER_VERSION_NUMBER [$COMPILER_VERSION_STRING]" >&6;}
1.4323
1.4324
1.4325 # Now that we have resolved CXX ourself, let autoconf have its go at it
1.4326 @@ -30862,9 +29147,2228 @@
1.4327 COMPARABLE_ACTUAL_VERSION=`$AWK -F. '{ printf("%05d%05d%05d\n", $1, $2, $3) }' <<< "$CC_VERSION"`
1.4328
1.4329
1.4330 - ### Locate other tools
1.4331 -
1.4332 - if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.4333 + #
1.4334 + # Setup the preprocessor (CPP and CXXCPP)
1.4335 + #
1.4336 + ac_ext=c
1.4337 +ac_cpp='$CPP $CPPFLAGS'
1.4338 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.4339 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.4340 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
1.4341 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
1.4342 +$as_echo_n "checking how to run the C preprocessor... " >&6; }
1.4343 +# On Suns, sometimes $CPP names a directory.
1.4344 +if test -n "$CPP" && test -d "$CPP"; then
1.4345 + CPP=
1.4346 +fi
1.4347 +if test -z "$CPP"; then
1.4348 + if ${ac_cv_prog_CPP+:} false; then :
1.4349 + $as_echo_n "(cached) " >&6
1.4350 +else
1.4351 + # Double quotes because CPP needs to be expanded
1.4352 + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
1.4353 + do
1.4354 + ac_preproc_ok=false
1.4355 +for ac_c_preproc_warn_flag in '' yes
1.4356 +do
1.4357 + # Use a header file that comes with gcc, so configuring glibc
1.4358 + # with a fresh cross-compiler works.
1.4359 + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.4360 + # <limits.h> exists even on freestanding compilers.
1.4361 + # On the NeXT, cc -E runs the code through the compiler's parser,
1.4362 + # not just through cpp. "Syntax error" is here to catch this case.
1.4363 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.4364 +/* end confdefs.h. */
1.4365 +#ifdef __STDC__
1.4366 +# include <limits.h>
1.4367 +#else
1.4368 +# include <assert.h>
1.4369 +#endif
1.4370 + Syntax error
1.4371 +_ACEOF
1.4372 +if ac_fn_c_try_cpp "$LINENO"; then :
1.4373 +
1.4374 +else
1.4375 + # Broken: fails on valid input.
1.4376 +continue
1.4377 +fi
1.4378 +rm -f conftest.err conftest.i conftest.$ac_ext
1.4379 +
1.4380 + # OK, works on sane cases. Now check whether nonexistent headers
1.4381 + # can be detected and how.
1.4382 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.4383 +/* end confdefs.h. */
1.4384 +#include <ac_nonexistent.h>
1.4385 +_ACEOF
1.4386 +if ac_fn_c_try_cpp "$LINENO"; then :
1.4387 + # Broken: success on invalid input.
1.4388 +continue
1.4389 +else
1.4390 + # Passes both tests.
1.4391 +ac_preproc_ok=:
1.4392 +break
1.4393 +fi
1.4394 +rm -f conftest.err conftest.i conftest.$ac_ext
1.4395 +
1.4396 +done
1.4397 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
1.4398 +rm -f conftest.i conftest.err conftest.$ac_ext
1.4399 +if $ac_preproc_ok; then :
1.4400 + break
1.4401 +fi
1.4402 +
1.4403 + done
1.4404 + ac_cv_prog_CPP=$CPP
1.4405 +
1.4406 +fi
1.4407 + CPP=$ac_cv_prog_CPP
1.4408 +else
1.4409 + ac_cv_prog_CPP=$CPP
1.4410 +fi
1.4411 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
1.4412 +$as_echo "$CPP" >&6; }
1.4413 +ac_preproc_ok=false
1.4414 +for ac_c_preproc_warn_flag in '' yes
1.4415 +do
1.4416 + # Use a header file that comes with gcc, so configuring glibc
1.4417 + # with a fresh cross-compiler works.
1.4418 + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.4419 + # <limits.h> exists even on freestanding compilers.
1.4420 + # On the NeXT, cc -E runs the code through the compiler's parser,
1.4421 + # not just through cpp. "Syntax error" is here to catch this case.
1.4422 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.4423 +/* end confdefs.h. */
1.4424 +#ifdef __STDC__
1.4425 +# include <limits.h>
1.4426 +#else
1.4427 +# include <assert.h>
1.4428 +#endif
1.4429 + Syntax error
1.4430 +_ACEOF
1.4431 +if ac_fn_c_try_cpp "$LINENO"; then :
1.4432 +
1.4433 +else
1.4434 + # Broken: fails on valid input.
1.4435 +continue
1.4436 +fi
1.4437 +rm -f conftest.err conftest.i conftest.$ac_ext
1.4438 +
1.4439 + # OK, works on sane cases. Now check whether nonexistent headers
1.4440 + # can be detected and how.
1.4441 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.4442 +/* end confdefs.h. */
1.4443 +#include <ac_nonexistent.h>
1.4444 +_ACEOF
1.4445 +if ac_fn_c_try_cpp "$LINENO"; then :
1.4446 + # Broken: success on invalid input.
1.4447 +continue
1.4448 +else
1.4449 + # Passes both tests.
1.4450 +ac_preproc_ok=:
1.4451 +break
1.4452 +fi
1.4453 +rm -f conftest.err conftest.i conftest.$ac_ext
1.4454 +
1.4455 +done
1.4456 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
1.4457 +rm -f conftest.i conftest.err conftest.$ac_ext
1.4458 +if $ac_preproc_ok; then :
1.4459 +
1.4460 +else
1.4461 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.4462 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.4463 +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
1.4464 +See \`config.log' for more details" "$LINENO" 5; }
1.4465 +fi
1.4466 +
1.4467 +ac_ext=cpp
1.4468 +ac_cpp='$CXXCPP $CPPFLAGS'
1.4469 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.4470 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.4471 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1.4472 +
1.4473 +
1.4474 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.4475 +
1.4476 + # First separate the path from the arguments. This will split at the first
1.4477 + # space.
1.4478 + complete="$CPP"
1.4479 + path="${complete%% *}"
1.4480 + tmp="$complete EOL"
1.4481 + arguments="${tmp#* }"
1.4482 +
1.4483 + # Input might be given as Windows format, start by converting to
1.4484 + # unix format.
1.4485 + new_path=`$CYGPATH -u "$path"`
1.4486 +
1.4487 + # Now try to locate executable using which
1.4488 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.4489 + # bat and cmd files are not always considered executable in cygwin causing which
1.4490 + # to not find them
1.4491 + if test "x$new_path" = x \
1.4492 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.4493 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.4494 + new_path=`$CYGPATH -u "$path"`
1.4495 + fi
1.4496 + if test "x$new_path" = x; then
1.4497 + # Oops. Which didn't find the executable.
1.4498 + # The splitting of arguments from the executable at a space might have been incorrect,
1.4499 + # since paths with space are more likely in Windows. Give it another try with the whole
1.4500 + # argument.
1.4501 + path="$complete"
1.4502 + arguments="EOL"
1.4503 + new_path=`$CYGPATH -u "$path"`
1.4504 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.4505 + # bat and cmd files are not always considered executable in cygwin causing which
1.4506 + # to not find them
1.4507 + if test "x$new_path" = x \
1.4508 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.4509 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.4510 + new_path=`$CYGPATH -u "$path"`
1.4511 + fi
1.4512 + if test "x$new_path" = x; then
1.4513 + # It's still not found. Now this is an unrecoverable error.
1.4514 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$complete\", is not found." >&5
1.4515 +$as_echo "$as_me: The path of CPP, which resolves as \"$complete\", is not found." >&6;}
1.4516 + has_space=`$ECHO "$complete" | $GREP " "`
1.4517 + if test "x$has_space" != x; then
1.4518 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.4519 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.4520 + fi
1.4521 + as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5
1.4522 + fi
1.4523 + fi
1.4524 +
1.4525 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.4526 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.4527 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.4528 + # "foo.exe" is OK but "foo" is an error.
1.4529 + #
1.4530 + # This test is therefore slightly more accurate than "test -f" to check for file presence.
1.4531 + # It is also a way to make sure we got the proper file name for the real test later on.
1.4532 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.4533 + if test "x$test_shortpath" = x; then
1.4534 + # Short path failed, file does not exist as specified.
1.4535 + # Try adding .exe or .cmd
1.4536 + if test -f "${new_path}.exe"; then
1.4537 + input_to_shortpath="${new_path}.exe"
1.4538 + elif test -f "${new_path}.cmd"; then
1.4539 + input_to_shortpath="${new_path}.cmd"
1.4540 + else
1.4541 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$new_path\", is invalid." >&5
1.4542 +$as_echo "$as_me: The path of CPP, which resolves as \"$new_path\", is invalid." >&6;}
1.4543 + { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.4544 +$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.4545 + as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5
1.4546 + fi
1.4547 + else
1.4548 + input_to_shortpath="$new_path"
1.4549 + fi
1.4550 +
1.4551 + # Call helper function which possibly converts this using DOS-style short mode.
1.4552 + # If so, the updated path is stored in $new_path.
1.4553 + new_path="$input_to_shortpath"
1.4554 +
1.4555 + input_path="$input_to_shortpath"
1.4556 + # Check if we need to convert this using DOS-style short mode. If the path
1.4557 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.4558 + # take no chances and rewrite it.
1.4559 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.4560 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.4561 + if test "x$has_forbidden_chars" != x; then
1.4562 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.4563 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.4564 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.4565 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.4566 + # Going to short mode and back again did indeed matter. Since short mode is
1.4567 + # case insensitive, let's make it lowercase to improve readability.
1.4568 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.4569 + # Now convert it back to Unix-stile (cygpath)
1.4570 + input_path=`$CYGPATH -u "$shortmode_path"`
1.4571 + new_path="$input_path"
1.4572 + fi
1.4573 + fi
1.4574 +
1.4575 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.4576 + if test "x$test_cygdrive_prefix" = x; then
1.4577 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.4578 + if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
1.4579 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.4580 + # a path prefixed by /cygdrive for fixpath to work.
1.4581 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.4582 + fi
1.4583 + fi
1.4584 +
1.4585 + # remove trailing .exe if any
1.4586 + new_path="${new_path/%.exe/}"
1.4587 +
1.4588 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.4589 +
1.4590 + # First separate the path from the arguments. This will split at the first
1.4591 + # space.
1.4592 + complete="$CPP"
1.4593 + path="${complete%% *}"
1.4594 + tmp="$complete EOL"
1.4595 + arguments="${tmp#* }"
1.4596 +
1.4597 + # Input might be given as Windows format, start by converting to
1.4598 + # unix format.
1.4599 + new_path="$path"
1.4600 +
1.4601 + windows_path="$new_path"
1.4602 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.4603 + unix_path=`$CYGPATH -u "$windows_path"`
1.4604 + new_path="$unix_path"
1.4605 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.4606 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.4607 + new_path="$unix_path"
1.4608 + fi
1.4609 +
1.4610 +
1.4611 + # Now try to locate executable using which
1.4612 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.4613 +
1.4614 + if test "x$new_path" = x; then
1.4615 + # Oops. Which didn't find the executable.
1.4616 + # The splitting of arguments from the executable at a space might have been incorrect,
1.4617 + # since paths with space are more likely in Windows. Give it another try with the whole
1.4618 + # argument.
1.4619 + path="$complete"
1.4620 + arguments="EOL"
1.4621 + new_path="$path"
1.4622 +
1.4623 + windows_path="$new_path"
1.4624 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.4625 + unix_path=`$CYGPATH -u "$windows_path"`
1.4626 + new_path="$unix_path"
1.4627 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.4628 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.4629 + new_path="$unix_path"
1.4630 + fi
1.4631 +
1.4632 +
1.4633 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.4634 +
1.4635 + if test "x$new_path" = x; then
1.4636 + # It's still not found. Now this is an unrecoverable error.
1.4637 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$complete\", is not found." >&5
1.4638 +$as_echo "$as_me: The path of CPP, which resolves as \"$complete\", is not found." >&6;}
1.4639 + has_space=`$ECHO "$complete" | $GREP " "`
1.4640 + if test "x$has_space" != x; then
1.4641 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.4642 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.4643 + fi
1.4644 + as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5
1.4645 + fi
1.4646 + fi
1.4647 +
1.4648 + # Now new_path has a complete unix path to the binary
1.4649 + if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
1.4650 + # Keep paths in /bin as-is, but remove trailing .exe if any
1.4651 + new_path="${new_path/%.exe/}"
1.4652 + # Do not save /bin paths to all_fixpath_prefixes!
1.4653 + else
1.4654 + # Not in mixed or Windows style, start by that.
1.4655 + new_path=`cmd //c echo $new_path`
1.4656 +
1.4657 + input_path="$new_path"
1.4658 + # Check if we need to convert this using DOS-style short mode. If the path
1.4659 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.4660 + # take no chances and rewrite it.
1.4661 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.4662 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.4663 + if test "x$has_forbidden_chars" != x; then
1.4664 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.4665 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.4666 + fi
1.4667 +
1.4668 + # Output is in $new_path
1.4669 +
1.4670 + windows_path="$new_path"
1.4671 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.4672 + unix_path=`$CYGPATH -u "$windows_path"`
1.4673 + new_path="$unix_path"
1.4674 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.4675 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.4676 + new_path="$unix_path"
1.4677 + fi
1.4678 +
1.4679 + # remove trailing .exe if any
1.4680 + new_path="${new_path/%.exe/}"
1.4681 +
1.4682 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.4683 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.4684 + fi
1.4685 +
1.4686 + else
1.4687 + # We're on a posix platform. Hooray! :)
1.4688 + # First separate the path from the arguments. This will split at the first
1.4689 + # space.
1.4690 + complete="$CPP"
1.4691 + path="${complete%% *}"
1.4692 + tmp="$complete EOL"
1.4693 + arguments="${tmp#* }"
1.4694 +
1.4695 + # Cannot rely on the command "which" here since it doesn't always work.
1.4696 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.4697 + if test -z "$is_absolute_path"; then
1.4698 + # Path to executable is not absolute. Find it.
1.4699 + IFS_save="$IFS"
1.4700 + IFS=:
1.4701 + for p in $PATH; do
1.4702 + if test -f "$p/$path" && test -x "$p/$path"; then
1.4703 + new_path="$p/$path"
1.4704 + break
1.4705 + fi
1.4706 + done
1.4707 + IFS="$IFS_save"
1.4708 + else
1.4709 + # This is an absolute path, we can use it without further modifications.
1.4710 + new_path="$path"
1.4711 + fi
1.4712 +
1.4713 + if test "x$new_path" = x; then
1.4714 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$complete\", is not found." >&5
1.4715 +$as_echo "$as_me: The path of CPP, which resolves as \"$complete\", is not found." >&6;}
1.4716 + has_space=`$ECHO "$complete" | $GREP " "`
1.4717 + if test "x$has_space" != x; then
1.4718 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.4719 +$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.4720 + fi
1.4721 + as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5
1.4722 + fi
1.4723 + fi
1.4724 +
1.4725 + # Now join together the path and the arguments once again
1.4726 + if test "x$arguments" != xEOL; then
1.4727 + new_complete="$new_path ${arguments% *}"
1.4728 + else
1.4729 + new_complete="$new_path"
1.4730 + fi
1.4731 +
1.4732 + if test "x$complete" != "x$new_complete"; then
1.4733 + CPP="$new_complete"
1.4734 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CPP to \"$new_complete\"" >&5
1.4735 +$as_echo "$as_me: Rewriting CPP to \"$new_complete\"" >&6;}
1.4736 + fi
1.4737 +
1.4738 + ac_ext=cpp
1.4739 +ac_cpp='$CXXCPP $CPPFLAGS'
1.4740 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.4741 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.4742 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1.4743 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
1.4744 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
1.4745 +if test -z "$CXXCPP"; then
1.4746 + if ${ac_cv_prog_CXXCPP+:} false; then :
1.4747 + $as_echo_n "(cached) " >&6
1.4748 +else
1.4749 + # Double quotes because CXXCPP needs to be expanded
1.4750 + for CXXCPP in "$CXX -E" "/lib/cpp"
1.4751 + do
1.4752 + ac_preproc_ok=false
1.4753 +for ac_cxx_preproc_warn_flag in '' yes
1.4754 +do
1.4755 + # Use a header file that comes with gcc, so configuring glibc
1.4756 + # with a fresh cross-compiler works.
1.4757 + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.4758 + # <limits.h> exists even on freestanding compilers.
1.4759 + # On the NeXT, cc -E runs the code through the compiler's parser,
1.4760 + # not just through cpp. "Syntax error" is here to catch this case.
1.4761 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.4762 +/* end confdefs.h. */
1.4763 +#ifdef __STDC__
1.4764 +# include <limits.h>
1.4765 +#else
1.4766 +# include <assert.h>
1.4767 +#endif
1.4768 + Syntax error
1.4769 +_ACEOF
1.4770 +if ac_fn_cxx_try_cpp "$LINENO"; then :
1.4771 +
1.4772 +else
1.4773 + # Broken: fails on valid input.
1.4774 +continue
1.4775 +fi
1.4776 +rm -f conftest.err conftest.i conftest.$ac_ext
1.4777 +
1.4778 + # OK, works on sane cases. Now check whether nonexistent headers
1.4779 + # can be detected and how.
1.4780 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.4781 +/* end confdefs.h. */
1.4782 +#include <ac_nonexistent.h>
1.4783 +_ACEOF
1.4784 +if ac_fn_cxx_try_cpp "$LINENO"; then :
1.4785 + # Broken: success on invalid input.
1.4786 +continue
1.4787 +else
1.4788 + # Passes both tests.
1.4789 +ac_preproc_ok=:
1.4790 +break
1.4791 +fi
1.4792 +rm -f conftest.err conftest.i conftest.$ac_ext
1.4793 +
1.4794 +done
1.4795 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
1.4796 +rm -f conftest.i conftest.err conftest.$ac_ext
1.4797 +if $ac_preproc_ok; then :
1.4798 + break
1.4799 +fi
1.4800 +
1.4801 + done
1.4802 + ac_cv_prog_CXXCPP=$CXXCPP
1.4803 +
1.4804 +fi
1.4805 + CXXCPP=$ac_cv_prog_CXXCPP
1.4806 +else
1.4807 + ac_cv_prog_CXXCPP=$CXXCPP
1.4808 +fi
1.4809 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
1.4810 +$as_echo "$CXXCPP" >&6; }
1.4811 +ac_preproc_ok=false
1.4812 +for ac_cxx_preproc_warn_flag in '' yes
1.4813 +do
1.4814 + # Use a header file that comes with gcc, so configuring glibc
1.4815 + # with a fresh cross-compiler works.
1.4816 + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.4817 + # <limits.h> exists even on freestanding compilers.
1.4818 + # On the NeXT, cc -E runs the code through the compiler's parser,
1.4819 + # not just through cpp. "Syntax error" is here to catch this case.
1.4820 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.4821 +/* end confdefs.h. */
1.4822 +#ifdef __STDC__
1.4823 +# include <limits.h>
1.4824 +#else
1.4825 +# include <assert.h>
1.4826 +#endif
1.4827 + Syntax error
1.4828 +_ACEOF
1.4829 +if ac_fn_cxx_try_cpp "$LINENO"; then :
1.4830 +
1.4831 +else
1.4832 + # Broken: fails on valid input.
1.4833 +continue
1.4834 +fi
1.4835 +rm -f conftest.err conftest.i conftest.$ac_ext
1.4836 +
1.4837 + # OK, works on sane cases. Now check whether nonexistent headers
1.4838 + # can be detected and how.
1.4839 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.4840 +/* end confdefs.h. */
1.4841 +#include <ac_nonexistent.h>
1.4842 +_ACEOF
1.4843 +if ac_fn_cxx_try_cpp "$LINENO"; then :
1.4844 + # Broken: success on invalid input.
1.4845 +continue
1.4846 +else
1.4847 + # Passes both tests.
1.4848 +ac_preproc_ok=:
1.4849 +break
1.4850 +fi
1.4851 +rm -f conftest.err conftest.i conftest.$ac_ext
1.4852 +
1.4853 +done
1.4854 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
1.4855 +rm -f conftest.i conftest.err conftest.$ac_ext
1.4856 +if $ac_preproc_ok; then :
1.4857 +
1.4858 +else
1.4859 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.4860 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.4861 +as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
1.4862 +See \`config.log' for more details" "$LINENO" 5; }
1.4863 +fi
1.4864 +
1.4865 +ac_ext=cpp
1.4866 +ac_cpp='$CXXCPP $CPPFLAGS'
1.4867 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.4868 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.4869 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1.4870 +
1.4871 +
1.4872 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.4873 +
1.4874 + # First separate the path from the arguments. This will split at the first
1.4875 + # space.
1.4876 + complete="$CXXCPP"
1.4877 + path="${complete%% *}"
1.4878 + tmp="$complete EOL"
1.4879 + arguments="${tmp#* }"
1.4880 +
1.4881 + # Input might be given as Windows format, start by converting to
1.4882 + # unix format.
1.4883 + new_path=`$CYGPATH -u "$path"`
1.4884 +
1.4885 + # Now try to locate executable using which
1.4886 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.4887 + # bat and cmd files are not always considered executable in cygwin causing which
1.4888 + # to not find them
1.4889 + if test "x$new_path" = x \
1.4890 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.4891 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.4892 + new_path=`$CYGPATH -u "$path"`
1.4893 + fi
1.4894 + if test "x$new_path" = x; then
1.4895 + # Oops. Which didn't find the executable.
1.4896 + # The splitting of arguments from the executable at a space might have been incorrect,
1.4897 + # since paths with space are more likely in Windows. Give it another try with the whole
1.4898 + # argument.
1.4899 + path="$complete"
1.4900 + arguments="EOL"
1.4901 + new_path=`$CYGPATH -u "$path"`
1.4902 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.4903 + # bat and cmd files are not always considered executable in cygwin causing which
1.4904 + # to not find them
1.4905 + if test "x$new_path" = x \
1.4906 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.4907 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.4908 + new_path=`$CYGPATH -u "$path"`
1.4909 + fi
1.4910 + if test "x$new_path" = x; then
1.4911 + # It's still not found. Now this is an unrecoverable error.
1.4912 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$complete\", is not found." >&5
1.4913 +$as_echo "$as_me: The path of CXXCPP, which resolves as \"$complete\", is not found." >&6;}
1.4914 + has_space=`$ECHO "$complete" | $GREP " "`
1.4915 + if test "x$has_space" != x; then
1.4916 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.4917 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.4918 + fi
1.4919 + as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5
1.4920 + fi
1.4921 + fi
1.4922 +
1.4923 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.4924 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.4925 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.4926 + # "foo.exe" is OK but "foo" is an error.
1.4927 + #
1.4928 + # This test is therefore slightly more accurate than "test -f" to check for file presence.
1.4929 + # It is also a way to make sure we got the proper file name for the real test later on.
1.4930 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.4931 + if test "x$test_shortpath" = x; then
1.4932 + # Short path failed, file does not exist as specified.
1.4933 + # Try adding .exe or .cmd
1.4934 + if test -f "${new_path}.exe"; then
1.4935 + input_to_shortpath="${new_path}.exe"
1.4936 + elif test -f "${new_path}.cmd"; then
1.4937 + input_to_shortpath="${new_path}.cmd"
1.4938 + else
1.4939 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$new_path\", is invalid." >&5
1.4940 +$as_echo "$as_me: The path of CXXCPP, which resolves as \"$new_path\", is invalid." >&6;}
1.4941 + { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.4942 +$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.4943 + as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5
1.4944 + fi
1.4945 + else
1.4946 + input_to_shortpath="$new_path"
1.4947 + fi
1.4948 +
1.4949 + # Call helper function which possibly converts this using DOS-style short mode.
1.4950 + # If so, the updated path is stored in $new_path.
1.4951 + new_path="$input_to_shortpath"
1.4952 +
1.4953 + input_path="$input_to_shortpath"
1.4954 + # Check if we need to convert this using DOS-style short mode. If the path
1.4955 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.4956 + # take no chances and rewrite it.
1.4957 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.4958 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.4959 + if test "x$has_forbidden_chars" != x; then
1.4960 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.4961 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.4962 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.4963 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.4964 + # Going to short mode and back again did indeed matter. Since short mode is
1.4965 + # case insensitive, let's make it lowercase to improve readability.
1.4966 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.4967 + # Now convert it back to Unix-stile (cygpath)
1.4968 + input_path=`$CYGPATH -u "$shortmode_path"`
1.4969 + new_path="$input_path"
1.4970 + fi
1.4971 + fi
1.4972 +
1.4973 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.4974 + if test "x$test_cygdrive_prefix" = x; then
1.4975 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.4976 + if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
1.4977 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.4978 + # a path prefixed by /cygdrive for fixpath to work.
1.4979 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.4980 + fi
1.4981 + fi
1.4982 +
1.4983 + # remove trailing .exe if any
1.4984 + new_path="${new_path/%.exe/}"
1.4985 +
1.4986 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.4987 +
1.4988 + # First separate the path from the arguments. This will split at the first
1.4989 + # space.
1.4990 + complete="$CXXCPP"
1.4991 + path="${complete%% *}"
1.4992 + tmp="$complete EOL"
1.4993 + arguments="${tmp#* }"
1.4994 +
1.4995 + # Input might be given as Windows format, start by converting to
1.4996 + # unix format.
1.4997 + new_path="$path"
1.4998 +
1.4999 + windows_path="$new_path"
1.5000 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.5001 + unix_path=`$CYGPATH -u "$windows_path"`
1.5002 + new_path="$unix_path"
1.5003 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.5004 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.5005 + new_path="$unix_path"
1.5006 + fi
1.5007 +
1.5008 +
1.5009 + # Now try to locate executable using which
1.5010 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.5011 +
1.5012 + if test "x$new_path" = x; then
1.5013 + # Oops. Which didn't find the executable.
1.5014 + # The splitting of arguments from the executable at a space might have been incorrect,
1.5015 + # since paths with space are more likely in Windows. Give it another try with the whole
1.5016 + # argument.
1.5017 + path="$complete"
1.5018 + arguments="EOL"
1.5019 + new_path="$path"
1.5020 +
1.5021 + windows_path="$new_path"
1.5022 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.5023 + unix_path=`$CYGPATH -u "$windows_path"`
1.5024 + new_path="$unix_path"
1.5025 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.5026 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.5027 + new_path="$unix_path"
1.5028 + fi
1.5029 +
1.5030 +
1.5031 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.5032 +
1.5033 + if test "x$new_path" = x; then
1.5034 + # It's still not found. Now this is an unrecoverable error.
1.5035 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$complete\", is not found." >&5
1.5036 +$as_echo "$as_me: The path of CXXCPP, which resolves as \"$complete\", is not found." >&6;}
1.5037 + has_space=`$ECHO "$complete" | $GREP " "`
1.5038 + if test "x$has_space" != x; then
1.5039 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.5040 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.5041 + fi
1.5042 + as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5
1.5043 + fi
1.5044 + fi
1.5045 +
1.5046 + # Now new_path has a complete unix path to the binary
1.5047 + if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
1.5048 + # Keep paths in /bin as-is, but remove trailing .exe if any
1.5049 + new_path="${new_path/%.exe/}"
1.5050 + # Do not save /bin paths to all_fixpath_prefixes!
1.5051 + else
1.5052 + # Not in mixed or Windows style, start by that.
1.5053 + new_path=`cmd //c echo $new_path`
1.5054 +
1.5055 + input_path="$new_path"
1.5056 + # Check if we need to convert this using DOS-style short mode. If the path
1.5057 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.5058 + # take no chances and rewrite it.
1.5059 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.5060 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.5061 + if test "x$has_forbidden_chars" != x; then
1.5062 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.5063 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.5064 + fi
1.5065 +
1.5066 + # Output is in $new_path
1.5067 +
1.5068 + windows_path="$new_path"
1.5069 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.5070 + unix_path=`$CYGPATH -u "$windows_path"`
1.5071 + new_path="$unix_path"
1.5072 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.5073 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.5074 + new_path="$unix_path"
1.5075 + fi
1.5076 +
1.5077 + # remove trailing .exe if any
1.5078 + new_path="${new_path/%.exe/}"
1.5079 +
1.5080 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.5081 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.5082 + fi
1.5083 +
1.5084 + else
1.5085 + # We're on a posix platform. Hooray! :)
1.5086 + # First separate the path from the arguments. This will split at the first
1.5087 + # space.
1.5088 + complete="$CXXCPP"
1.5089 + path="${complete%% *}"
1.5090 + tmp="$complete EOL"
1.5091 + arguments="${tmp#* }"
1.5092 +
1.5093 + # Cannot rely on the command "which" here since it doesn't always work.
1.5094 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.5095 + if test -z "$is_absolute_path"; then
1.5096 + # Path to executable is not absolute. Find it.
1.5097 + IFS_save="$IFS"
1.5098 + IFS=:
1.5099 + for p in $PATH; do
1.5100 + if test -f "$p/$path" && test -x "$p/$path"; then
1.5101 + new_path="$p/$path"
1.5102 + break
1.5103 + fi
1.5104 + done
1.5105 + IFS="$IFS_save"
1.5106 + else
1.5107 + # This is an absolute path, we can use it without further modifications.
1.5108 + new_path="$path"
1.5109 + fi
1.5110 +
1.5111 + if test "x$new_path" = x; then
1.5112 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$complete\", is not found." >&5
1.5113 +$as_echo "$as_me: The path of CXXCPP, which resolves as \"$complete\", is not found." >&6;}
1.5114 + has_space=`$ECHO "$complete" | $GREP " "`
1.5115 + if test "x$has_space" != x; then
1.5116 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.5117 +$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.5118 + fi
1.5119 + as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5
1.5120 + fi
1.5121 + fi
1.5122 +
1.5123 + # Now join together the path and the arguments once again
1.5124 + if test "x$arguments" != xEOL; then
1.5125 + new_complete="$new_path ${arguments% *}"
1.5126 + else
1.5127 + new_complete="$new_path"
1.5128 + fi
1.5129 +
1.5130 + if test "x$complete" != "x$new_complete"; then
1.5131 + CXXCPP="$new_complete"
1.5132 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXXCPP to \"$new_complete\"" >&5
1.5133 +$as_echo "$as_me: Rewriting CXXCPP to \"$new_complete\"" >&6;}
1.5134 + fi
1.5135 +
1.5136 +
1.5137 + #
1.5138 + # Setup the linker (LD)
1.5139 + #
1.5140 + if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.5141 + # In the Microsoft toolchain we have a separate LD command "link".
1.5142 + # Make sure we reject /usr/bin/link (as determined in CYGWIN_LINK), which is
1.5143 + # a cygwin program for something completely different.
1.5144 + # Extract the first word of "link", so it can be a program name with args.
1.5145 +set dummy link; ac_word=$2
1.5146 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.5147 +$as_echo_n "checking for $ac_word... " >&6; }
1.5148 +if ${ac_cv_prog_LD+:} false; then :
1.5149 + $as_echo_n "(cached) " >&6
1.5150 +else
1.5151 + if test -n "$LD"; then
1.5152 + ac_cv_prog_LD="$LD" # Let the user override the test.
1.5153 +else
1.5154 + ac_prog_rejected=no
1.5155 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.5156 +for as_dir in $PATH
1.5157 +do
1.5158 + IFS=$as_save_IFS
1.5159 + test -z "$as_dir" && as_dir=.
1.5160 + for ac_exec_ext in '' $ac_executable_extensions; do
1.5161 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.5162 + if test "$as_dir/$ac_word$ac_exec_ext" = "$CYGWIN_LINK"; then
1.5163 + ac_prog_rejected=yes
1.5164 + continue
1.5165 + fi
1.5166 + ac_cv_prog_LD="link"
1.5167 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.5168 + break 2
1.5169 + fi
1.5170 +done
1.5171 + done
1.5172 +IFS=$as_save_IFS
1.5173 +
1.5174 +if test $ac_prog_rejected = yes; then
1.5175 + # We found a bogon in the path, so make sure we never use it.
1.5176 + set dummy $ac_cv_prog_LD
1.5177 + shift
1.5178 + if test $# != 0; then
1.5179 + # We chose a different compiler from the bogus one.
1.5180 + # However, it has the same basename, so the bogon will be chosen
1.5181 + # first if we set LD to just the basename; use the full file name.
1.5182 + shift
1.5183 + ac_cv_prog_LD="$as_dir/$ac_word${1+' '}$@"
1.5184 + fi
1.5185 +fi
1.5186 +fi
1.5187 +fi
1.5188 +LD=$ac_cv_prog_LD
1.5189 +if test -n "$LD"; then
1.5190 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
1.5191 +$as_echo "$LD" >&6; }
1.5192 +else
1.5193 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.5194 +$as_echo "no" >&6; }
1.5195 +fi
1.5196 +
1.5197 +
1.5198 +
1.5199 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.5200 +
1.5201 + # First separate the path from the arguments. This will split at the first
1.5202 + # space.
1.5203 + complete="$LD"
1.5204 + path="${complete%% *}"
1.5205 + tmp="$complete EOL"
1.5206 + arguments="${tmp#* }"
1.5207 +
1.5208 + # Input might be given as Windows format, start by converting to
1.5209 + # unix format.
1.5210 + new_path=`$CYGPATH -u "$path"`
1.5211 +
1.5212 + # Now try to locate executable using which
1.5213 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.5214 + # bat and cmd files are not always considered executable in cygwin causing which
1.5215 + # to not find them
1.5216 + if test "x$new_path" = x \
1.5217 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5218 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5219 + new_path=`$CYGPATH -u "$path"`
1.5220 + fi
1.5221 + if test "x$new_path" = x; then
1.5222 + # Oops. Which didn't find the executable.
1.5223 + # The splitting of arguments from the executable at a space might have been incorrect,
1.5224 + # since paths with space are more likely in Windows. Give it another try with the whole
1.5225 + # argument.
1.5226 + path="$complete"
1.5227 + arguments="EOL"
1.5228 + new_path=`$CYGPATH -u "$path"`
1.5229 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.5230 + # bat and cmd files are not always considered executable in cygwin causing which
1.5231 + # to not find them
1.5232 + if test "x$new_path" = x \
1.5233 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5234 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5235 + new_path=`$CYGPATH -u "$path"`
1.5236 + fi
1.5237 + if test "x$new_path" = x; then
1.5238 + # It's still not found. Now this is an unrecoverable error.
1.5239 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LD, which resolves as \"$complete\", is not found." >&5
1.5240 +$as_echo "$as_me: The path of LD, which resolves as \"$complete\", is not found." >&6;}
1.5241 + has_space=`$ECHO "$complete" | $GREP " "`
1.5242 + if test "x$has_space" != x; then
1.5243 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.5244 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.5245 + fi
1.5246 + as_fn_error $? "Cannot locate the the path of LD" "$LINENO" 5
1.5247 + fi
1.5248 + fi
1.5249 +
1.5250 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.5251 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.5252 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.5253 + # "foo.exe" is OK but "foo" is an error.
1.5254 + #
1.5255 + # This test is therefore slightly more accurate than "test -f" to check for file presence.
1.5256 + # It is also a way to make sure we got the proper file name for the real test later on.
1.5257 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.5258 + if test "x$test_shortpath" = x; then
1.5259 + # Short path failed, file does not exist as specified.
1.5260 + # Try adding .exe or .cmd
1.5261 + if test -f "${new_path}.exe"; then
1.5262 + input_to_shortpath="${new_path}.exe"
1.5263 + elif test -f "${new_path}.cmd"; then
1.5264 + input_to_shortpath="${new_path}.cmd"
1.5265 + else
1.5266 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LD, which resolves as \"$new_path\", is invalid." >&5
1.5267 +$as_echo "$as_me: The path of LD, which resolves as \"$new_path\", is invalid." >&6;}
1.5268 + { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.5269 +$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.5270 + as_fn_error $? "Cannot locate the the path of LD" "$LINENO" 5
1.5271 + fi
1.5272 + else
1.5273 + input_to_shortpath="$new_path"
1.5274 + fi
1.5275 +
1.5276 + # Call helper function which possibly converts this using DOS-style short mode.
1.5277 + # If so, the updated path is stored in $new_path.
1.5278 + new_path="$input_to_shortpath"
1.5279 +
1.5280 + input_path="$input_to_shortpath"
1.5281 + # Check if we need to convert this using DOS-style short mode. If the path
1.5282 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.5283 + # take no chances and rewrite it.
1.5284 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.5285 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.5286 + if test "x$has_forbidden_chars" != x; then
1.5287 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.5288 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.5289 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.5290 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.5291 + # Going to short mode and back again did indeed matter. Since short mode is
1.5292 + # case insensitive, let's make it lowercase to improve readability.
1.5293 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.5294 + # Now convert it back to Unix-stile (cygpath)
1.5295 + input_path=`$CYGPATH -u "$shortmode_path"`
1.5296 + new_path="$input_path"
1.5297 + fi
1.5298 + fi
1.5299 +
1.5300 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.5301 + if test "x$test_cygdrive_prefix" = x; then
1.5302 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.5303 + if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
1.5304 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.5305 + # a path prefixed by /cygdrive for fixpath to work.
1.5306 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.5307 + fi
1.5308 + fi
1.5309 +
1.5310 + # remove trailing .exe if any
1.5311 + new_path="${new_path/%.exe/}"
1.5312 +
1.5313 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.5314 +
1.5315 + # First separate the path from the arguments. This will split at the first
1.5316 + # space.
1.5317 + complete="$LD"
1.5318 + path="${complete%% *}"
1.5319 + tmp="$complete EOL"
1.5320 + arguments="${tmp#* }"
1.5321 +
1.5322 + # Input might be given as Windows format, start by converting to
1.5323 + # unix format.
1.5324 + new_path="$path"
1.5325 +
1.5326 + windows_path="$new_path"
1.5327 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.5328 + unix_path=`$CYGPATH -u "$windows_path"`
1.5329 + new_path="$unix_path"
1.5330 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.5331 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.5332 + new_path="$unix_path"
1.5333 + fi
1.5334 +
1.5335 +
1.5336 + # Now try to locate executable using which
1.5337 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.5338 +
1.5339 + if test "x$new_path" = x; then
1.5340 + # Oops. Which didn't find the executable.
1.5341 + # The splitting of arguments from the executable at a space might have been incorrect,
1.5342 + # since paths with space are more likely in Windows. Give it another try with the whole
1.5343 + # argument.
1.5344 + path="$complete"
1.5345 + arguments="EOL"
1.5346 + new_path="$path"
1.5347 +
1.5348 + windows_path="$new_path"
1.5349 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.5350 + unix_path=`$CYGPATH -u "$windows_path"`
1.5351 + new_path="$unix_path"
1.5352 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.5353 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.5354 + new_path="$unix_path"
1.5355 + fi
1.5356 +
1.5357 +
1.5358 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.5359 +
1.5360 + if test "x$new_path" = x; then
1.5361 + # It's still not found. Now this is an unrecoverable error.
1.5362 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LD, which resolves as \"$complete\", is not found." >&5
1.5363 +$as_echo "$as_me: The path of LD, which resolves as \"$complete\", is not found." >&6;}
1.5364 + has_space=`$ECHO "$complete" | $GREP " "`
1.5365 + if test "x$has_space" != x; then
1.5366 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.5367 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.5368 + fi
1.5369 + as_fn_error $? "Cannot locate the the path of LD" "$LINENO" 5
1.5370 + fi
1.5371 + fi
1.5372 +
1.5373 + # Now new_path has a complete unix path to the binary
1.5374 + if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
1.5375 + # Keep paths in /bin as-is, but remove trailing .exe if any
1.5376 + new_path="${new_path/%.exe/}"
1.5377 + # Do not save /bin paths to all_fixpath_prefixes!
1.5378 + else
1.5379 + # Not in mixed or Windows style, start by that.
1.5380 + new_path=`cmd //c echo $new_path`
1.5381 +
1.5382 + input_path="$new_path"
1.5383 + # Check if we need to convert this using DOS-style short mode. If the path
1.5384 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.5385 + # take no chances and rewrite it.
1.5386 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.5387 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.5388 + if test "x$has_forbidden_chars" != x; then
1.5389 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.5390 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.5391 + fi
1.5392 +
1.5393 + # Output is in $new_path
1.5394 +
1.5395 + windows_path="$new_path"
1.5396 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.5397 + unix_path=`$CYGPATH -u "$windows_path"`
1.5398 + new_path="$unix_path"
1.5399 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.5400 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.5401 + new_path="$unix_path"
1.5402 + fi
1.5403 +
1.5404 + # remove trailing .exe if any
1.5405 + new_path="${new_path/%.exe/}"
1.5406 +
1.5407 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.5408 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.5409 + fi
1.5410 +
1.5411 + else
1.5412 + # We're on a posix platform. Hooray! :)
1.5413 + # First separate the path from the arguments. This will split at the first
1.5414 + # space.
1.5415 + complete="$LD"
1.5416 + path="${complete%% *}"
1.5417 + tmp="$complete EOL"
1.5418 + arguments="${tmp#* }"
1.5419 +
1.5420 + # Cannot rely on the command "which" here since it doesn't always work.
1.5421 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.5422 + if test -z "$is_absolute_path"; then
1.5423 + # Path to executable is not absolute. Find it.
1.5424 + IFS_save="$IFS"
1.5425 + IFS=:
1.5426 + for p in $PATH; do
1.5427 + if test -f "$p/$path" && test -x "$p/$path"; then
1.5428 + new_path="$p/$path"
1.5429 + break
1.5430 + fi
1.5431 + done
1.5432 + IFS="$IFS_save"
1.5433 + else
1.5434 + # This is an absolute path, we can use it without further modifications.
1.5435 + new_path="$path"
1.5436 + fi
1.5437 +
1.5438 + if test "x$new_path" = x; then
1.5439 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LD, which resolves as \"$complete\", is not found." >&5
1.5440 +$as_echo "$as_me: The path of LD, which resolves as \"$complete\", is not found." >&6;}
1.5441 + has_space=`$ECHO "$complete" | $GREP " "`
1.5442 + if test "x$has_space" != x; then
1.5443 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.5444 +$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.5445 + fi
1.5446 + as_fn_error $? "Cannot locate the the path of LD" "$LINENO" 5
1.5447 + fi
1.5448 + fi
1.5449 +
1.5450 + # Now join together the path and the arguments once again
1.5451 + if test "x$arguments" != xEOL; then
1.5452 + new_complete="$new_path ${arguments% *}"
1.5453 + else
1.5454 + new_complete="$new_path"
1.5455 + fi
1.5456 +
1.5457 + if test "x$complete" != "x$new_complete"; then
1.5458 + LD="$new_complete"
1.5459 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting LD to \"$new_complete\"" >&5
1.5460 +$as_echo "$as_me: Rewriting LD to \"$new_complete\"" >&6;}
1.5461 + fi
1.5462 +
1.5463 + # Verify that we indeed succeeded with this trick.
1.5464 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the found link.exe is actually the Visual Studio linker" >&5
1.5465 +$as_echo_n "checking if the found link.exe is actually the Visual Studio linker... " >&6; }
1.5466 + "$LD" --version > /dev/null
1.5467 + if test $? -eq 0 ; then
1.5468 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.5469 +$as_echo "no" >&6; }
1.5470 + as_fn_error $? "This is the Cygwin link tool. Please check your PATH and rerun configure." "$LINENO" 5
1.5471 + else
1.5472 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.5473 +$as_echo "yes" >&6; }
1.5474 + fi
1.5475 + LDCXX="$LD"
1.5476 + else
1.5477 + # All other toolchains use the compiler to link.
1.5478 + LD="$CC"
1.5479 + LDCXX="$CXX"
1.5480 + fi
1.5481 +
1.5482 + # FIXME: it should be CXXLD, according to standard (cf CXXCPP)
1.5483 +
1.5484 +
1.5485 + #
1.5486 + # Setup the assembler (AS)
1.5487 + #
1.5488 + if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.5489 + # FIXME: should this really be solaris, or solstudio?
1.5490 +
1.5491 +
1.5492 + # Publish this variable in the help.
1.5493 +
1.5494 +
1.5495 + if test "x$AS" = x; then
1.5496 + # The variable is not set by user, try to locate tool using the code snippet
1.5497 + for ac_prog in as
1.5498 +do
1.5499 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.5500 +set dummy $ac_prog; ac_word=$2
1.5501 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.5502 +$as_echo_n "checking for $ac_word... " >&6; }
1.5503 +if ${ac_cv_path_AS+:} false; then :
1.5504 + $as_echo_n "(cached) " >&6
1.5505 +else
1.5506 + case $AS in
1.5507 + [\\/]* | ?:[\\/]*)
1.5508 + ac_cv_path_AS="$AS" # Let the user override the test with a path.
1.5509 + ;;
1.5510 + *)
1.5511 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.5512 +for as_dir in $PATH
1.5513 +do
1.5514 + IFS=$as_save_IFS
1.5515 + test -z "$as_dir" && as_dir=.
1.5516 + for ac_exec_ext in '' $ac_executable_extensions; do
1.5517 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.5518 + ac_cv_path_AS="$as_dir/$ac_word$ac_exec_ext"
1.5519 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.5520 + break 2
1.5521 + fi
1.5522 +done
1.5523 + done
1.5524 +IFS=$as_save_IFS
1.5525 +
1.5526 + ;;
1.5527 +esac
1.5528 +fi
1.5529 +AS=$ac_cv_path_AS
1.5530 +if test -n "$AS"; then
1.5531 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
1.5532 +$as_echo "$AS" >&6; }
1.5533 +else
1.5534 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.5535 +$as_echo "no" >&6; }
1.5536 +fi
1.5537 +
1.5538 +
1.5539 + test -n "$AS" && break
1.5540 +done
1.5541 +
1.5542 + else
1.5543 + # The variable is set, but is it from the command line or the environment?
1.5544 +
1.5545 + # Try to remove the string !AS! from our list.
1.5546 + try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!AS!/}
1.5547 + if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.5548 + # If it failed, the variable was not from the command line. Ignore it,
1.5549 + # but warn the user (except for BASH, which is always set by the calling BASH).
1.5550 + if test "xAS" != xBASH; then
1.5551 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of AS from the environment. Use command line variables instead." >&5
1.5552 +$as_echo "$as_me: WARNING: Ignoring value of AS from the environment. Use command line variables instead." >&2;}
1.5553 + fi
1.5554 + # Try to locate tool using the code snippet
1.5555 + for ac_prog in as
1.5556 +do
1.5557 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.5558 +set dummy $ac_prog; ac_word=$2
1.5559 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.5560 +$as_echo_n "checking for $ac_word... " >&6; }
1.5561 +if ${ac_cv_path_AS+:} false; then :
1.5562 + $as_echo_n "(cached) " >&6
1.5563 +else
1.5564 + case $AS in
1.5565 + [\\/]* | ?:[\\/]*)
1.5566 + ac_cv_path_AS="$AS" # Let the user override the test with a path.
1.5567 + ;;
1.5568 + *)
1.5569 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.5570 +for as_dir in $PATH
1.5571 +do
1.5572 + IFS=$as_save_IFS
1.5573 + test -z "$as_dir" && as_dir=.
1.5574 + for ac_exec_ext in '' $ac_executable_extensions; do
1.5575 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.5576 + ac_cv_path_AS="$as_dir/$ac_word$ac_exec_ext"
1.5577 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.5578 + break 2
1.5579 + fi
1.5580 +done
1.5581 + done
1.5582 +IFS=$as_save_IFS
1.5583 +
1.5584 + ;;
1.5585 +esac
1.5586 +fi
1.5587 +AS=$ac_cv_path_AS
1.5588 +if test -n "$AS"; then
1.5589 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
1.5590 +$as_echo "$AS" >&6; }
1.5591 +else
1.5592 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.5593 +$as_echo "no" >&6; }
1.5594 +fi
1.5595 +
1.5596 +
1.5597 + test -n "$AS" && break
1.5598 +done
1.5599 +
1.5600 + else
1.5601 + # If it succeeded, then it was overridden by the user. We will use it
1.5602 + # for the tool.
1.5603 +
1.5604 + # First remove it from the list of overridden variables, so we can test
1.5605 + # for unknown variables in the end.
1.5606 + CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.5607 +
1.5608 + # Check if the provided tool contains a complete path.
1.5609 + tool_specified="$AS"
1.5610 + tool_basename="${tool_specified##*/}"
1.5611 + if test "x$tool_basename" = "x$tool_specified"; then
1.5612 + # A command without a complete path is provided, search $PATH.
1.5613 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool AS=$tool_basename" >&5
1.5614 +$as_echo "$as_me: Will search for user supplied tool AS=$tool_basename" >&6;}
1.5615 + # Extract the first word of "$tool_basename", so it can be a program name with args.
1.5616 +set dummy $tool_basename; ac_word=$2
1.5617 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.5618 +$as_echo_n "checking for $ac_word... " >&6; }
1.5619 +if ${ac_cv_path_AS+:} false; then :
1.5620 + $as_echo_n "(cached) " >&6
1.5621 +else
1.5622 + case $AS in
1.5623 + [\\/]* | ?:[\\/]*)
1.5624 + ac_cv_path_AS="$AS" # Let the user override the test with a path.
1.5625 + ;;
1.5626 + *)
1.5627 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.5628 +for as_dir in $PATH
1.5629 +do
1.5630 + IFS=$as_save_IFS
1.5631 + test -z "$as_dir" && as_dir=.
1.5632 + for ac_exec_ext in '' $ac_executable_extensions; do
1.5633 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.5634 + ac_cv_path_AS="$as_dir/$ac_word$ac_exec_ext"
1.5635 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.5636 + break 2
1.5637 + fi
1.5638 +done
1.5639 + done
1.5640 +IFS=$as_save_IFS
1.5641 +
1.5642 + ;;
1.5643 +esac
1.5644 +fi
1.5645 +AS=$ac_cv_path_AS
1.5646 +if test -n "$AS"; then
1.5647 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
1.5648 +$as_echo "$AS" >&6; }
1.5649 +else
1.5650 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.5651 +$as_echo "no" >&6; }
1.5652 +fi
1.5653 +
1.5654 +
1.5655 + if test "x$AS" = x; then
1.5656 + as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.5657 + fi
1.5658 + else
1.5659 + # Otherwise we believe it is a complete path. Use it as it is.
1.5660 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool AS=$tool_specified" >&5
1.5661 +$as_echo "$as_me: Will use user supplied tool AS=$tool_specified" >&6;}
1.5662 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AS" >&5
1.5663 +$as_echo_n "checking for AS... " >&6; }
1.5664 + if test ! -x "$tool_specified"; then
1.5665 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.5666 +$as_echo "not found" >&6; }
1.5667 + as_fn_error $? "User supplied tool AS=$tool_specified does not exist or is not executable" "$LINENO" 5
1.5668 + fi
1.5669 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.5670 +$as_echo "$tool_specified" >&6; }
1.5671 + fi
1.5672 + fi
1.5673 + fi
1.5674 +
1.5675 +
1.5676 +
1.5677 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.5678 +
1.5679 + # First separate the path from the arguments. This will split at the first
1.5680 + # space.
1.5681 + complete="$AS"
1.5682 + path="${complete%% *}"
1.5683 + tmp="$complete EOL"
1.5684 + arguments="${tmp#* }"
1.5685 +
1.5686 + # Input might be given as Windows format, start by converting to
1.5687 + # unix format.
1.5688 + new_path=`$CYGPATH -u "$path"`
1.5689 +
1.5690 + # Now try to locate executable using which
1.5691 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.5692 + # bat and cmd files are not always considered executable in cygwin causing which
1.5693 + # to not find them
1.5694 + if test "x$new_path" = x \
1.5695 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5696 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5697 + new_path=`$CYGPATH -u "$path"`
1.5698 + fi
1.5699 + if test "x$new_path" = x; then
1.5700 + # Oops. Which didn't find the executable.
1.5701 + # The splitting of arguments from the executable at a space might have been incorrect,
1.5702 + # since paths with space are more likely in Windows. Give it another try with the whole
1.5703 + # argument.
1.5704 + path="$complete"
1.5705 + arguments="EOL"
1.5706 + new_path=`$CYGPATH -u "$path"`
1.5707 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.5708 + # bat and cmd files are not always considered executable in cygwin causing which
1.5709 + # to not find them
1.5710 + if test "x$new_path" = x \
1.5711 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.5712 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.5713 + new_path=`$CYGPATH -u "$path"`
1.5714 + fi
1.5715 + if test "x$new_path" = x; then
1.5716 + # It's still not found. Now this is an unrecoverable error.
1.5717 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$complete\", is not found." >&5
1.5718 +$as_echo "$as_me: The path of AS, which resolves as \"$complete\", is not found." >&6;}
1.5719 + has_space=`$ECHO "$complete" | $GREP " "`
1.5720 + if test "x$has_space" != x; then
1.5721 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.5722 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.5723 + fi
1.5724 + as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5
1.5725 + fi
1.5726 + fi
1.5727 +
1.5728 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.5729 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.5730 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.5731 + # "foo.exe" is OK but "foo" is an error.
1.5732 + #
1.5733 + # This test is therefore slightly more accurate than "test -f" to check for file presence.
1.5734 + # It is also a way to make sure we got the proper file name for the real test later on.
1.5735 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.5736 + if test "x$test_shortpath" = x; then
1.5737 + # Short path failed, file does not exist as specified.
1.5738 + # Try adding .exe or .cmd
1.5739 + if test -f "${new_path}.exe"; then
1.5740 + input_to_shortpath="${new_path}.exe"
1.5741 + elif test -f "${new_path}.cmd"; then
1.5742 + input_to_shortpath="${new_path}.cmd"
1.5743 + else
1.5744 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$new_path\", is invalid." >&5
1.5745 +$as_echo "$as_me: The path of AS, which resolves as \"$new_path\", is invalid." >&6;}
1.5746 + { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.5747 +$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.5748 + as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5
1.5749 + fi
1.5750 + else
1.5751 + input_to_shortpath="$new_path"
1.5752 + fi
1.5753 +
1.5754 + # Call helper function which possibly converts this using DOS-style short mode.
1.5755 + # If so, the updated path is stored in $new_path.
1.5756 + new_path="$input_to_shortpath"
1.5757 +
1.5758 + input_path="$input_to_shortpath"
1.5759 + # Check if we need to convert this using DOS-style short mode. If the path
1.5760 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.5761 + # take no chances and rewrite it.
1.5762 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.5763 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.5764 + if test "x$has_forbidden_chars" != x; then
1.5765 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.5766 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.5767 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.5768 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.5769 + # Going to short mode and back again did indeed matter. Since short mode is
1.5770 + # case insensitive, let's make it lowercase to improve readability.
1.5771 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.5772 + # Now convert it back to Unix-stile (cygpath)
1.5773 + input_path=`$CYGPATH -u "$shortmode_path"`
1.5774 + new_path="$input_path"
1.5775 + fi
1.5776 + fi
1.5777 +
1.5778 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.5779 + if test "x$test_cygdrive_prefix" = x; then
1.5780 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.5781 + if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
1.5782 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.5783 + # a path prefixed by /cygdrive for fixpath to work.
1.5784 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.5785 + fi
1.5786 + fi
1.5787 +
1.5788 + # remove trailing .exe if any
1.5789 + new_path="${new_path/%.exe/}"
1.5790 +
1.5791 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.5792 +
1.5793 + # First separate the path from the arguments. This will split at the first
1.5794 + # space.
1.5795 + complete="$AS"
1.5796 + path="${complete%% *}"
1.5797 + tmp="$complete EOL"
1.5798 + arguments="${tmp#* }"
1.5799 +
1.5800 + # Input might be given as Windows format, start by converting to
1.5801 + # unix format.
1.5802 + new_path="$path"
1.5803 +
1.5804 + windows_path="$new_path"
1.5805 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.5806 + unix_path=`$CYGPATH -u "$windows_path"`
1.5807 + new_path="$unix_path"
1.5808 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.5809 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.5810 + new_path="$unix_path"
1.5811 + fi
1.5812 +
1.5813 +
1.5814 + # Now try to locate executable using which
1.5815 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.5816 +
1.5817 + if test "x$new_path" = x; then
1.5818 + # Oops. Which didn't find the executable.
1.5819 + # The splitting of arguments from the executable at a space might have been incorrect,
1.5820 + # since paths with space are more likely in Windows. Give it another try with the whole
1.5821 + # argument.
1.5822 + path="$complete"
1.5823 + arguments="EOL"
1.5824 + new_path="$path"
1.5825 +
1.5826 + windows_path="$new_path"
1.5827 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.5828 + unix_path=`$CYGPATH -u "$windows_path"`
1.5829 + new_path="$unix_path"
1.5830 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.5831 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.5832 + new_path="$unix_path"
1.5833 + fi
1.5834 +
1.5835 +
1.5836 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.5837 +
1.5838 + if test "x$new_path" = x; then
1.5839 + # It's still not found. Now this is an unrecoverable error.
1.5840 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$complete\", is not found." >&5
1.5841 +$as_echo "$as_me: The path of AS, which resolves as \"$complete\", is not found." >&6;}
1.5842 + has_space=`$ECHO "$complete" | $GREP " "`
1.5843 + if test "x$has_space" != x; then
1.5844 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.5845 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.5846 + fi
1.5847 + as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5
1.5848 + fi
1.5849 + fi
1.5850 +
1.5851 + # Now new_path has a complete unix path to the binary
1.5852 + if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
1.5853 + # Keep paths in /bin as-is, but remove trailing .exe if any
1.5854 + new_path="${new_path/%.exe/}"
1.5855 + # Do not save /bin paths to all_fixpath_prefixes!
1.5856 + else
1.5857 + # Not in mixed or Windows style, start by that.
1.5858 + new_path=`cmd //c echo $new_path`
1.5859 +
1.5860 + input_path="$new_path"
1.5861 + # Check if we need to convert this using DOS-style short mode. If the path
1.5862 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.5863 + # take no chances and rewrite it.
1.5864 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.5865 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.5866 + if test "x$has_forbidden_chars" != x; then
1.5867 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.5868 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.5869 + fi
1.5870 +
1.5871 + # Output is in $new_path
1.5872 +
1.5873 + windows_path="$new_path"
1.5874 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.5875 + unix_path=`$CYGPATH -u "$windows_path"`
1.5876 + new_path="$unix_path"
1.5877 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.5878 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.5879 + new_path="$unix_path"
1.5880 + fi
1.5881 +
1.5882 + # remove trailing .exe if any
1.5883 + new_path="${new_path/%.exe/}"
1.5884 +
1.5885 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.5886 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.5887 + fi
1.5888 +
1.5889 + else
1.5890 + # We're on a posix platform. Hooray! :)
1.5891 + # First separate the path from the arguments. This will split at the first
1.5892 + # space.
1.5893 + complete="$AS"
1.5894 + path="${complete%% *}"
1.5895 + tmp="$complete EOL"
1.5896 + arguments="${tmp#* }"
1.5897 +
1.5898 + # Cannot rely on the command "which" here since it doesn't always work.
1.5899 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.5900 + if test -z "$is_absolute_path"; then
1.5901 + # Path to executable is not absolute. Find it.
1.5902 + IFS_save="$IFS"
1.5903 + IFS=:
1.5904 + for p in $PATH; do
1.5905 + if test -f "$p/$path" && test -x "$p/$path"; then
1.5906 + new_path="$p/$path"
1.5907 + break
1.5908 + fi
1.5909 + done
1.5910 + IFS="$IFS_save"
1.5911 + else
1.5912 + # This is an absolute path, we can use it without further modifications.
1.5913 + new_path="$path"
1.5914 + fi
1.5915 +
1.5916 + if test "x$new_path" = x; then
1.5917 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$complete\", is not found." >&5
1.5918 +$as_echo "$as_me: The path of AS, which resolves as \"$complete\", is not found." >&6;}
1.5919 + has_space=`$ECHO "$complete" | $GREP " "`
1.5920 + if test "x$has_space" != x; then
1.5921 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.5922 +$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.5923 + fi
1.5924 + as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5
1.5925 + fi
1.5926 + fi
1.5927 +
1.5928 + # Now join together the path and the arguments once again
1.5929 + if test "x$arguments" != xEOL; then
1.5930 + new_complete="$new_path ${arguments% *}"
1.5931 + else
1.5932 + new_complete="$new_path"
1.5933 + fi
1.5934 +
1.5935 + if test "x$complete" != "x$new_complete"; then
1.5936 + AS="$new_complete"
1.5937 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AS to \"$new_complete\"" >&5
1.5938 +$as_echo "$as_me: Rewriting AS to \"$new_complete\"" >&6;}
1.5939 + fi
1.5940 +
1.5941 + else
1.5942 + # FIXME: is this correct for microsoft?
1.5943 + AS="$CC -c"
1.5944 + fi
1.5945 +
1.5946 +
1.5947 + #
1.5948 + # Setup the archiver (AR)
1.5949 + #
1.5950 + if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.5951 + # The corresponding ar tool is lib.exe (used to create static libraries)
1.5952 + # Extract the first word of "lib", so it can be a program name with args.
1.5953 +set dummy lib; ac_word=$2
1.5954 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.5955 +$as_echo_n "checking for $ac_word... " >&6; }
1.5956 +if ${ac_cv_prog_AR+:} false; then :
1.5957 + $as_echo_n "(cached) " >&6
1.5958 +else
1.5959 + if test -n "$AR"; then
1.5960 + ac_cv_prog_AR="$AR" # Let the user override the test.
1.5961 +else
1.5962 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.5963 +for as_dir in $PATH
1.5964 +do
1.5965 + IFS=$as_save_IFS
1.5966 + test -z "$as_dir" && as_dir=.
1.5967 + for ac_exec_ext in '' $ac_executable_extensions; do
1.5968 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.5969 + ac_cv_prog_AR="lib"
1.5970 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.5971 + break 2
1.5972 + fi
1.5973 +done
1.5974 + done
1.5975 +IFS=$as_save_IFS
1.5976 +
1.5977 +fi
1.5978 +fi
1.5979 +AR=$ac_cv_prog_AR
1.5980 +if test -n "$AR"; then
1.5981 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
1.5982 +$as_echo "$AR" >&6; }
1.5983 +else
1.5984 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.5985 +$as_echo "no" >&6; }
1.5986 +fi
1.5987 +
1.5988 +
1.5989 + else
1.5990 +
1.5991 +
1.5992 + # Publish this variable in the help.
1.5993 +
1.5994 +
1.5995 + if test "x$AR" = x; then
1.5996 + # The variable is not set by user, try to locate tool using the code snippet
1.5997 + if test -n "$ac_tool_prefix"; then
1.5998 + for ac_prog in ar
1.5999 + do
1.6000 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.6001 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.6002 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.6003 +$as_echo_n "checking for $ac_word... " >&6; }
1.6004 +if ${ac_cv_prog_AR+:} false; then :
1.6005 + $as_echo_n "(cached) " >&6
1.6006 +else
1.6007 + if test -n "$AR"; then
1.6008 + ac_cv_prog_AR="$AR" # Let the user override the test.
1.6009 +else
1.6010 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.6011 +for as_dir in $PATH
1.6012 +do
1.6013 + IFS=$as_save_IFS
1.6014 + test -z "$as_dir" && as_dir=.
1.6015 + for ac_exec_ext in '' $ac_executable_extensions; do
1.6016 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.6017 + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
1.6018 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.6019 + break 2
1.6020 + fi
1.6021 +done
1.6022 + done
1.6023 +IFS=$as_save_IFS
1.6024 +
1.6025 +fi
1.6026 +fi
1.6027 +AR=$ac_cv_prog_AR
1.6028 +if test -n "$AR"; then
1.6029 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
1.6030 +$as_echo "$AR" >&6; }
1.6031 +else
1.6032 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.6033 +$as_echo "no" >&6; }
1.6034 +fi
1.6035 +
1.6036 +
1.6037 + test -n "$AR" && break
1.6038 + done
1.6039 +fi
1.6040 +if test -z "$AR"; then
1.6041 + ac_ct_AR=$AR
1.6042 + for ac_prog in ar
1.6043 +do
1.6044 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.6045 +set dummy $ac_prog; ac_word=$2
1.6046 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.6047 +$as_echo_n "checking for $ac_word... " >&6; }
1.6048 +if ${ac_cv_prog_ac_ct_AR+:} false; then :
1.6049 + $as_echo_n "(cached) " >&6
1.6050 +else
1.6051 + if test -n "$ac_ct_AR"; then
1.6052 + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
1.6053 +else
1.6054 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.6055 +for as_dir in $PATH
1.6056 +do
1.6057 + IFS=$as_save_IFS
1.6058 + test -z "$as_dir" && as_dir=.
1.6059 + for ac_exec_ext in '' $ac_executable_extensions; do
1.6060 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.6061 + ac_cv_prog_ac_ct_AR="$ac_prog"
1.6062 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.6063 + break 2
1.6064 + fi
1.6065 +done
1.6066 + done
1.6067 +IFS=$as_save_IFS
1.6068 +
1.6069 +fi
1.6070 +fi
1.6071 +ac_ct_AR=$ac_cv_prog_ac_ct_AR
1.6072 +if test -n "$ac_ct_AR"; then
1.6073 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
1.6074 +$as_echo "$ac_ct_AR" >&6; }
1.6075 +else
1.6076 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.6077 +$as_echo "no" >&6; }
1.6078 +fi
1.6079 +
1.6080 +
1.6081 + test -n "$ac_ct_AR" && break
1.6082 +done
1.6083 +
1.6084 + if test "x$ac_ct_AR" = x; then
1.6085 + AR=""
1.6086 + else
1.6087 + case $cross_compiling:$ac_tool_warned in
1.6088 +yes:)
1.6089 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.6090 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.6091 +ac_tool_warned=yes ;;
1.6092 +esac
1.6093 + AR=$ac_ct_AR
1.6094 + fi
1.6095 +fi
1.6096 +
1.6097 + else
1.6098 + # The variable is set, but is it from the command line or the environment?
1.6099 +
1.6100 + # Try to remove the string !AR! from our list.
1.6101 + try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!AR!/}
1.6102 + if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.6103 + # If it failed, the variable was not from the command line. Ignore it,
1.6104 + # but warn the user (except for BASH, which is always set by the calling BASH).
1.6105 + if test "xAR" != xBASH; then
1.6106 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of AR from the environment. Use command line variables instead." >&5
1.6107 +$as_echo "$as_me: WARNING: Ignoring value of AR from the environment. Use command line variables instead." >&2;}
1.6108 + fi
1.6109 + # Try to locate tool using the code snippet
1.6110 + if test -n "$ac_tool_prefix"; then
1.6111 + for ac_prog in ar
1.6112 + do
1.6113 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.6114 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.6115 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.6116 +$as_echo_n "checking for $ac_word... " >&6; }
1.6117 +if ${ac_cv_prog_AR+:} false; then :
1.6118 + $as_echo_n "(cached) " >&6
1.6119 +else
1.6120 + if test -n "$AR"; then
1.6121 + ac_cv_prog_AR="$AR" # Let the user override the test.
1.6122 +else
1.6123 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.6124 +for as_dir in $PATH
1.6125 +do
1.6126 + IFS=$as_save_IFS
1.6127 + test -z "$as_dir" && as_dir=.
1.6128 + for ac_exec_ext in '' $ac_executable_extensions; do
1.6129 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.6130 + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
1.6131 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.6132 + break 2
1.6133 + fi
1.6134 +done
1.6135 + done
1.6136 +IFS=$as_save_IFS
1.6137 +
1.6138 +fi
1.6139 +fi
1.6140 +AR=$ac_cv_prog_AR
1.6141 +if test -n "$AR"; then
1.6142 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
1.6143 +$as_echo "$AR" >&6; }
1.6144 +else
1.6145 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.6146 +$as_echo "no" >&6; }
1.6147 +fi
1.6148 +
1.6149 +
1.6150 + test -n "$AR" && break
1.6151 + done
1.6152 +fi
1.6153 +if test -z "$AR"; then
1.6154 + ac_ct_AR=$AR
1.6155 + for ac_prog in ar
1.6156 +do
1.6157 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.6158 +set dummy $ac_prog; ac_word=$2
1.6159 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.6160 +$as_echo_n "checking for $ac_word... " >&6; }
1.6161 +if ${ac_cv_prog_ac_ct_AR+:} false; then :
1.6162 + $as_echo_n "(cached) " >&6
1.6163 +else
1.6164 + if test -n "$ac_ct_AR"; then
1.6165 + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
1.6166 +else
1.6167 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.6168 +for as_dir in $PATH
1.6169 +do
1.6170 + IFS=$as_save_IFS
1.6171 + test -z "$as_dir" && as_dir=.
1.6172 + for ac_exec_ext in '' $ac_executable_extensions; do
1.6173 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.6174 + ac_cv_prog_ac_ct_AR="$ac_prog"
1.6175 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.6176 + break 2
1.6177 + fi
1.6178 +done
1.6179 + done
1.6180 +IFS=$as_save_IFS
1.6181 +
1.6182 +fi
1.6183 +fi
1.6184 +ac_ct_AR=$ac_cv_prog_ac_ct_AR
1.6185 +if test -n "$ac_ct_AR"; then
1.6186 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
1.6187 +$as_echo "$ac_ct_AR" >&6; }
1.6188 +else
1.6189 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.6190 +$as_echo "no" >&6; }
1.6191 +fi
1.6192 +
1.6193 +
1.6194 + test -n "$ac_ct_AR" && break
1.6195 +done
1.6196 +
1.6197 + if test "x$ac_ct_AR" = x; then
1.6198 + AR=""
1.6199 + else
1.6200 + case $cross_compiling:$ac_tool_warned in
1.6201 +yes:)
1.6202 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.6203 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.6204 +ac_tool_warned=yes ;;
1.6205 +esac
1.6206 + AR=$ac_ct_AR
1.6207 + fi
1.6208 +fi
1.6209 +
1.6210 + else
1.6211 + # If it succeeded, then it was overridden by the user. We will use it
1.6212 + # for the tool.
1.6213 +
1.6214 + # First remove it from the list of overridden variables, so we can test
1.6215 + # for unknown variables in the end.
1.6216 + CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.6217 +
1.6218 + # Check if the provided tool contains a complete path.
1.6219 + tool_specified="$AR"
1.6220 + tool_basename="${tool_specified##*/}"
1.6221 + if test "x$tool_basename" = "x$tool_specified"; then
1.6222 + # A command without a complete path is provided, search $PATH.
1.6223 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool AR=$tool_basename" >&5
1.6224 +$as_echo "$as_me: Will search for user supplied tool AR=$tool_basename" >&6;}
1.6225 + # Extract the first word of "$tool_basename", so it can be a program name with args.
1.6226 +set dummy $tool_basename; ac_word=$2
1.6227 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.6228 +$as_echo_n "checking for $ac_word... " >&6; }
1.6229 +if ${ac_cv_path_AR+:} false; then :
1.6230 + $as_echo_n "(cached) " >&6
1.6231 +else
1.6232 + case $AR in
1.6233 + [\\/]* | ?:[\\/]*)
1.6234 + ac_cv_path_AR="$AR" # Let the user override the test with a path.
1.6235 + ;;
1.6236 + *)
1.6237 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.6238 +for as_dir in $PATH
1.6239 +do
1.6240 + IFS=$as_save_IFS
1.6241 + test -z "$as_dir" && as_dir=.
1.6242 + for ac_exec_ext in '' $ac_executable_extensions; do
1.6243 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.6244 + ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
1.6245 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.6246 + break 2
1.6247 + fi
1.6248 +done
1.6249 + done
1.6250 +IFS=$as_save_IFS
1.6251 +
1.6252 + ;;
1.6253 +esac
1.6254 +fi
1.6255 +AR=$ac_cv_path_AR
1.6256 +if test -n "$AR"; then
1.6257 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
1.6258 +$as_echo "$AR" >&6; }
1.6259 +else
1.6260 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.6261 +$as_echo "no" >&6; }
1.6262 +fi
1.6263 +
1.6264 +
1.6265 + if test "x$AR" = x; then
1.6266 + as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.6267 + fi
1.6268 + else
1.6269 + # Otherwise we believe it is a complete path. Use it as it is.
1.6270 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool AR=$tool_specified" >&5
1.6271 +$as_echo "$as_me: Will use user supplied tool AR=$tool_specified" >&6;}
1.6272 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AR" >&5
1.6273 +$as_echo_n "checking for AR... " >&6; }
1.6274 + if test ! -x "$tool_specified"; then
1.6275 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.6276 +$as_echo "not found" >&6; }
1.6277 + as_fn_error $? "User supplied tool AR=$tool_specified does not exist or is not executable" "$LINENO" 5
1.6278 + fi
1.6279 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.6280 +$as_echo "$tool_specified" >&6; }
1.6281 + fi
1.6282 + fi
1.6283 + fi
1.6284 +
1.6285 +
1.6286 + fi
1.6287 +
1.6288 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.6289 +
1.6290 + # First separate the path from the arguments. This will split at the first
1.6291 + # space.
1.6292 + complete="$AR"
1.6293 + path="${complete%% *}"
1.6294 + tmp="$complete EOL"
1.6295 + arguments="${tmp#* }"
1.6296 +
1.6297 + # Input might be given as Windows format, start by converting to
1.6298 + # unix format.
1.6299 + new_path=`$CYGPATH -u "$path"`
1.6300 +
1.6301 + # Now try to locate executable using which
1.6302 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.6303 + # bat and cmd files are not always considered executable in cygwin causing which
1.6304 + # to not find them
1.6305 + if test "x$new_path" = x \
1.6306 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.6307 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.6308 + new_path=`$CYGPATH -u "$path"`
1.6309 + fi
1.6310 + if test "x$new_path" = x; then
1.6311 + # Oops. Which didn't find the executable.
1.6312 + # The splitting of arguments from the executable at a space might have been incorrect,
1.6313 + # since paths with space are more likely in Windows. Give it another try with the whole
1.6314 + # argument.
1.6315 + path="$complete"
1.6316 + arguments="EOL"
1.6317 + new_path=`$CYGPATH -u "$path"`
1.6318 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.6319 + # bat and cmd files are not always considered executable in cygwin causing which
1.6320 + # to not find them
1.6321 + if test "x$new_path" = x \
1.6322 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.6323 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.6324 + new_path=`$CYGPATH -u "$path"`
1.6325 + fi
1.6326 + if test "x$new_path" = x; then
1.6327 + # It's still not found. Now this is an unrecoverable error.
1.6328 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$complete\", is not found." >&5
1.6329 +$as_echo "$as_me: The path of AR, which resolves as \"$complete\", is not found." >&6;}
1.6330 + has_space=`$ECHO "$complete" | $GREP " "`
1.6331 + if test "x$has_space" != x; then
1.6332 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.6333 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.6334 + fi
1.6335 + as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5
1.6336 + fi
1.6337 + fi
1.6338 +
1.6339 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.6340 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.6341 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.6342 + # "foo.exe" is OK but "foo" is an error.
1.6343 + #
1.6344 + # This test is therefore slightly more accurate than "test -f" to check for file presence.
1.6345 + # It is also a way to make sure we got the proper file name for the real test later on.
1.6346 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.6347 + if test "x$test_shortpath" = x; then
1.6348 + # Short path failed, file does not exist as specified.
1.6349 + # Try adding .exe or .cmd
1.6350 + if test -f "${new_path}.exe"; then
1.6351 + input_to_shortpath="${new_path}.exe"
1.6352 + elif test -f "${new_path}.cmd"; then
1.6353 + input_to_shortpath="${new_path}.cmd"
1.6354 + else
1.6355 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$new_path\", is invalid." >&5
1.6356 +$as_echo "$as_me: The path of AR, which resolves as \"$new_path\", is invalid." >&6;}
1.6357 + { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.6358 +$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.6359 + as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5
1.6360 + fi
1.6361 + else
1.6362 + input_to_shortpath="$new_path"
1.6363 + fi
1.6364 +
1.6365 + # Call helper function which possibly converts this using DOS-style short mode.
1.6366 + # If so, the updated path is stored in $new_path.
1.6367 + new_path="$input_to_shortpath"
1.6368 +
1.6369 + input_path="$input_to_shortpath"
1.6370 + # Check if we need to convert this using DOS-style short mode. If the path
1.6371 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.6372 + # take no chances and rewrite it.
1.6373 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.6374 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.6375 + if test "x$has_forbidden_chars" != x; then
1.6376 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.6377 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.6378 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.6379 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.6380 + # Going to short mode and back again did indeed matter. Since short mode is
1.6381 + # case insensitive, let's make it lowercase to improve readability.
1.6382 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.6383 + # Now convert it back to Unix-stile (cygpath)
1.6384 + input_path=`$CYGPATH -u "$shortmode_path"`
1.6385 + new_path="$input_path"
1.6386 + fi
1.6387 + fi
1.6388 +
1.6389 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.6390 + if test "x$test_cygdrive_prefix" = x; then
1.6391 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.6392 + if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
1.6393 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.6394 + # a path prefixed by /cygdrive for fixpath to work.
1.6395 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.6396 + fi
1.6397 + fi
1.6398 +
1.6399 + # remove trailing .exe if any
1.6400 + new_path="${new_path/%.exe/}"
1.6401 +
1.6402 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.6403 +
1.6404 + # First separate the path from the arguments. This will split at the first
1.6405 + # space.
1.6406 + complete="$AR"
1.6407 + path="${complete%% *}"
1.6408 + tmp="$complete EOL"
1.6409 + arguments="${tmp#* }"
1.6410 +
1.6411 + # Input might be given as Windows format, start by converting to
1.6412 + # unix format.
1.6413 + new_path="$path"
1.6414 +
1.6415 + windows_path="$new_path"
1.6416 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.6417 + unix_path=`$CYGPATH -u "$windows_path"`
1.6418 + new_path="$unix_path"
1.6419 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.6420 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.6421 + new_path="$unix_path"
1.6422 + fi
1.6423 +
1.6424 +
1.6425 + # Now try to locate executable using which
1.6426 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.6427 +
1.6428 + if test "x$new_path" = x; then
1.6429 + # Oops. Which didn't find the executable.
1.6430 + # The splitting of arguments from the executable at a space might have been incorrect,
1.6431 + # since paths with space are more likely in Windows. Give it another try with the whole
1.6432 + # argument.
1.6433 + path="$complete"
1.6434 + arguments="EOL"
1.6435 + new_path="$path"
1.6436 +
1.6437 + windows_path="$new_path"
1.6438 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.6439 + unix_path=`$CYGPATH -u "$windows_path"`
1.6440 + new_path="$unix_path"
1.6441 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.6442 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.6443 + new_path="$unix_path"
1.6444 + fi
1.6445 +
1.6446 +
1.6447 + new_path=`$WHICH "$new_path" 2> /dev/null`
1.6448 +
1.6449 + if test "x$new_path" = x; then
1.6450 + # It's still not found. Now this is an unrecoverable error.
1.6451 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$complete\", is not found." >&5
1.6452 +$as_echo "$as_me: The path of AR, which resolves as \"$complete\", is not found." >&6;}
1.6453 + has_space=`$ECHO "$complete" | $GREP " "`
1.6454 + if test "x$has_space" != x; then
1.6455 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.6456 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.6457 + fi
1.6458 + as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5
1.6459 + fi
1.6460 + fi
1.6461 +
1.6462 + # Now new_path has a complete unix path to the binary
1.6463 + if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
1.6464 + # Keep paths in /bin as-is, but remove trailing .exe if any
1.6465 + new_path="${new_path/%.exe/}"
1.6466 + # Do not save /bin paths to all_fixpath_prefixes!
1.6467 + else
1.6468 + # Not in mixed or Windows style, start by that.
1.6469 + new_path=`cmd //c echo $new_path`
1.6470 +
1.6471 + input_path="$new_path"
1.6472 + # Check if we need to convert this using DOS-style short mode. If the path
1.6473 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.6474 + # take no chances and rewrite it.
1.6475 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.6476 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.6477 + if test "x$has_forbidden_chars" != x; then
1.6478 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.6479 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.6480 + fi
1.6481 +
1.6482 + # Output is in $new_path
1.6483 +
1.6484 + windows_path="$new_path"
1.6485 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.6486 + unix_path=`$CYGPATH -u "$windows_path"`
1.6487 + new_path="$unix_path"
1.6488 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.6489 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.6490 + new_path="$unix_path"
1.6491 + fi
1.6492 +
1.6493 + # remove trailing .exe if any
1.6494 + new_path="${new_path/%.exe/}"
1.6495 +
1.6496 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.6497 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.6498 + fi
1.6499 +
1.6500 + else
1.6501 + # We're on a posix platform. Hooray! :)
1.6502 + # First separate the path from the arguments. This will split at the first
1.6503 + # space.
1.6504 + complete="$AR"
1.6505 + path="${complete%% *}"
1.6506 + tmp="$complete EOL"
1.6507 + arguments="${tmp#* }"
1.6508 +
1.6509 + # Cannot rely on the command "which" here since it doesn't always work.
1.6510 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.6511 + if test -z "$is_absolute_path"; then
1.6512 + # Path to executable is not absolute. Find it.
1.6513 + IFS_save="$IFS"
1.6514 + IFS=:
1.6515 + for p in $PATH; do
1.6516 + if test -f "$p/$path" && test -x "$p/$path"; then
1.6517 + new_path="$p/$path"
1.6518 + break
1.6519 + fi
1.6520 + done
1.6521 + IFS="$IFS_save"
1.6522 + else
1.6523 + # This is an absolute path, we can use it without further modifications.
1.6524 + new_path="$path"
1.6525 + fi
1.6526 +
1.6527 + if test "x$new_path" = x; then
1.6528 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$complete\", is not found." >&5
1.6529 +$as_echo "$as_me: The path of AR, which resolves as \"$complete\", is not found." >&6;}
1.6530 + has_space=`$ECHO "$complete" | $GREP " "`
1.6531 + if test "x$has_space" != x; then
1.6532 + { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.6533 +$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.6534 + fi
1.6535 + as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5
1.6536 + fi
1.6537 + fi
1.6538 +
1.6539 + # Now join together the path and the arguments once again
1.6540 + if test "x$arguments" != xEOL; then
1.6541 + new_complete="$new_path ${arguments% *}"
1.6542 + else
1.6543 + new_complete="$new_path"
1.6544 + fi
1.6545 +
1.6546 + if test "x$complete" != "x$new_complete"; then
1.6547 + AR="$new_complete"
1.6548 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AR to \"$new_complete\"" >&5
1.6549 +$as_echo "$as_me: Rewriting AR to \"$new_complete\"" >&6;}
1.6550 + fi
1.6551 +
1.6552 +
1.6553 +
1.6554 + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.6555 ac_ext=m
1.6556 ac_cpp='$OBJCPP $CPPFLAGS'
1.6557 ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.6558 @@ -31352,8 +31856,7 @@
1.6559 done
1.6560 IFS="$IFS_save"
1.6561 else
1.6562 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJC (as $path) failed, using $path directly." >&5
1.6563 -$as_echo "$as_me: Resolving OBJC (as $path) failed, using $path directly." >&6;}
1.6564 + # This is an absolute path, we can use it without further modifications.
1.6565 new_path="$path"
1.6566 fi
1.6567
1.6568 @@ -31382,331 +31885,198 @@
1.6569 $as_echo "$as_me: Rewriting OBJC to \"$new_complete\"" >&6;}
1.6570 fi
1.6571
1.6572 - else
1.6573 - OBJC=
1.6574 - fi
1.6575 -
1.6576 - # Restore the flags to the user specified values.
1.6577 - # This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"
1.6578 - CFLAGS="$ORG_CFLAGS"
1.6579 - CXXFLAGS="$ORG_CXXFLAGS"
1.6580 - OBJCFLAGS="$ORG_OBJCFLAGS"
1.6581 -
1.6582 - LD="$CC"
1.6583 - LDEXE="$CC"
1.6584 - LDCXX="$CXX"
1.6585 - LDEXECXX="$CXX"
1.6586 -
1.6587 - # LDEXE is the linker to use, when creating executables.
1.6588 -
1.6589 - # Linking C++ libraries.
1.6590 -
1.6591 - # Linking C++ executables.
1.6592 -
1.6593 -
1.6594 - if test "x$OPENJDK_TARGET_OS" != xwindows; then
1.6595 -
1.6596 -
1.6597 - # Publish this variable in the help.
1.6598 -
1.6599 -
1.6600 - if test "x$AR" = x; then
1.6601 - # The variable is not set by user, try to locate tool using the code snippet
1.6602 - if test -n "$ac_tool_prefix"; then
1.6603 - for ac_prog in ar
1.6604 - do
1.6605 - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.6606 -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.6607 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.6608 -$as_echo_n "checking for $ac_word... " >&6; }
1.6609 -if ${ac_cv_prog_AR+:} false; then :
1.6610 - $as_echo_n "(cached) " >&6
1.6611 -else
1.6612 - if test -n "$AR"; then
1.6613 - ac_cv_prog_AR="$AR" # Let the user override the test.
1.6614 -else
1.6615 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.6616 -for as_dir in $PATH
1.6617 -do
1.6618 - IFS=$as_save_IFS
1.6619 - test -z "$as_dir" && as_dir=.
1.6620 - for ac_exec_ext in '' $ac_executable_extensions; do
1.6621 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.6622 - ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
1.6623 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.6624 - break 2
1.6625 - fi
1.6626 -done
1.6627 - done
1.6628 -IFS=$as_save_IFS
1.6629 -
1.6630 -fi
1.6631 -fi
1.6632 -AR=$ac_cv_prog_AR
1.6633 -if test -n "$AR"; then
1.6634 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
1.6635 -$as_echo "$AR" >&6; }
1.6636 -else
1.6637 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.6638 -$as_echo "no" >&6; }
1.6639 -fi
1.6640 -
1.6641 -
1.6642 - test -n "$AR" && break
1.6643 - done
1.6644 -fi
1.6645 -if test -z "$AR"; then
1.6646 - ac_ct_AR=$AR
1.6647 - for ac_prog in ar
1.6648 -do
1.6649 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.6650 -set dummy $ac_prog; ac_word=$2
1.6651 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.6652 -$as_echo_n "checking for $ac_word... " >&6; }
1.6653 -if ${ac_cv_prog_ac_ct_AR+:} false; then :
1.6654 - $as_echo_n "(cached) " >&6
1.6655 -else
1.6656 - if test -n "$ac_ct_AR"; then
1.6657 - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
1.6658 -else
1.6659 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.6660 -for as_dir in $PATH
1.6661 -do
1.6662 - IFS=$as_save_IFS
1.6663 - test -z "$as_dir" && as_dir=.
1.6664 - for ac_exec_ext in '' $ac_executable_extensions; do
1.6665 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.6666 - ac_cv_prog_ac_ct_AR="$ac_prog"
1.6667 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.6668 - break 2
1.6669 - fi
1.6670 -done
1.6671 - done
1.6672 -IFS=$as_save_IFS
1.6673 -
1.6674 -fi
1.6675 -fi
1.6676 -ac_ct_AR=$ac_cv_prog_ac_ct_AR
1.6677 -if test -n "$ac_ct_AR"; then
1.6678 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
1.6679 -$as_echo "$ac_ct_AR" >&6; }
1.6680 -else
1.6681 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.6682 -$as_echo "no" >&6; }
1.6683 -fi
1.6684 -
1.6685 -
1.6686 - test -n "$ac_ct_AR" && break
1.6687 -done
1.6688 -
1.6689 - if test "x$ac_ct_AR" = x; then
1.6690 - AR=""
1.6691 - else
1.6692 - case $cross_compiling:$ac_tool_warned in
1.6693 -yes:)
1.6694 -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.6695 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.6696 -ac_tool_warned=yes ;;
1.6697 -esac
1.6698 - AR=$ac_ct_AR
1.6699 - fi
1.6700 -fi
1.6701 -
1.6702 - else
1.6703 - # The variable is set, but is it from the command line or the environment?
1.6704 -
1.6705 - # Try to remove the string !AR! from our list.
1.6706 - try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!AR!/}
1.6707 - if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.6708 - # If it failed, the variable was not from the command line. Ignore it,
1.6709 - # but warn the user (except for BASH, which is always set by the calling BASH).
1.6710 - if test "xAR" != xBASH; then
1.6711 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of AR from the environment. Use command line variables instead." >&5
1.6712 -$as_echo "$as_me: WARNING: Ignoring value of AR from the environment. Use command line variables instead." >&2;}
1.6713 - fi
1.6714 - # Try to locate tool using the code snippet
1.6715 - if test -n "$ac_tool_prefix"; then
1.6716 - for ac_prog in ar
1.6717 - do
1.6718 - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.6719 -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.6720 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.6721 -$as_echo_n "checking for $ac_word... " >&6; }
1.6722 -if ${ac_cv_prog_AR+:} false; then :
1.6723 - $as_echo_n "(cached) " >&6
1.6724 -else
1.6725 - if test -n "$AR"; then
1.6726 - ac_cv_prog_AR="$AR" # Let the user override the test.
1.6727 -else
1.6728 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.6729 -for as_dir in $PATH
1.6730 -do
1.6731 - IFS=$as_save_IFS
1.6732 - test -z "$as_dir" && as_dir=.
1.6733 - for ac_exec_ext in '' $ac_executable_extensions; do
1.6734 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.6735 - ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
1.6736 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.6737 - break 2
1.6738 - fi
1.6739 -done
1.6740 - done
1.6741 -IFS=$as_save_IFS
1.6742 -
1.6743 -fi
1.6744 -fi
1.6745 -AR=$ac_cv_prog_AR
1.6746 -if test -n "$AR"; then
1.6747 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
1.6748 -$as_echo "$AR" >&6; }
1.6749 -else
1.6750 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.6751 -$as_echo "no" >&6; }
1.6752 -fi
1.6753 -
1.6754 -
1.6755 - test -n "$AR" && break
1.6756 - done
1.6757 -fi
1.6758 -if test -z "$AR"; then
1.6759 - ac_ct_AR=$AR
1.6760 - for ac_prog in ar
1.6761 -do
1.6762 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.6763 -set dummy $ac_prog; ac_word=$2
1.6764 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.6765 -$as_echo_n "checking for $ac_word... " >&6; }
1.6766 -if ${ac_cv_prog_ac_ct_AR+:} false; then :
1.6767 - $as_echo_n "(cached) " >&6
1.6768 -else
1.6769 - if test -n "$ac_ct_AR"; then
1.6770 - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
1.6771 -else
1.6772 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.6773 -for as_dir in $PATH
1.6774 -do
1.6775 - IFS=$as_save_IFS
1.6776 - test -z "$as_dir" && as_dir=.
1.6777 - for ac_exec_ext in '' $ac_executable_extensions; do
1.6778 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.6779 - ac_cv_prog_ac_ct_AR="$ac_prog"
1.6780 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.6781 - break 2
1.6782 - fi
1.6783 -done
1.6784 - done
1.6785 -IFS=$as_save_IFS
1.6786 -
1.6787 -fi
1.6788 -fi
1.6789 -ac_ct_AR=$ac_cv_prog_ac_ct_AR
1.6790 -if test -n "$ac_ct_AR"; then
1.6791 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
1.6792 -$as_echo "$ac_ct_AR" >&6; }
1.6793 -else
1.6794 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.6795 -$as_echo "no" >&6; }
1.6796 -fi
1.6797 -
1.6798 -
1.6799 - test -n "$ac_ct_AR" && break
1.6800 -done
1.6801 -
1.6802 - if test "x$ac_ct_AR" = x; then
1.6803 - AR=""
1.6804 - else
1.6805 - case $cross_compiling:$ac_tool_warned in
1.6806 -yes:)
1.6807 -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.6808 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.6809 -ac_tool_warned=yes ;;
1.6810 -esac
1.6811 - AR=$ac_ct_AR
1.6812 - fi
1.6813 -fi
1.6814 -
1.6815 - else
1.6816 - # If it succeeded, then it was overridden by the user. We will use it
1.6817 - # for the tool.
1.6818 -
1.6819 - # First remove it from the list of overridden variables, so we can test
1.6820 - # for unknown variables in the end.
1.6821 - CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.6822 -
1.6823 - # Check if the provided tool contains a complete path.
1.6824 - tool_specified="$AR"
1.6825 - tool_basename="${tool_specified##*/}"
1.6826 - if test "x$tool_basename" = "x$tool_specified"; then
1.6827 - # A command without a complete path is provided, search $PATH.
1.6828 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool AR=$tool_basename" >&5
1.6829 -$as_echo "$as_me: Will search for user supplied tool AR=$tool_basename" >&6;}
1.6830 - # Extract the first word of "$tool_basename", so it can be a program name with args.
1.6831 -set dummy $tool_basename; ac_word=$2
1.6832 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.6833 -$as_echo_n "checking for $ac_word... " >&6; }
1.6834 -if ${ac_cv_path_AR+:} false; then :
1.6835 - $as_echo_n "(cached) " >&6
1.6836 -else
1.6837 - case $AR in
1.6838 - [\\/]* | ?:[\\/]*)
1.6839 - ac_cv_path_AR="$AR" # Let the user override the test with a path.
1.6840 - ;;
1.6841 - *)
1.6842 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.6843 -for as_dir in $PATH
1.6844 -do
1.6845 - IFS=$as_save_IFS
1.6846 - test -z "$as_dir" && as_dir=.
1.6847 - for ac_exec_ext in '' $ac_executable_extensions; do
1.6848 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.6849 - ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
1.6850 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.6851 - break 2
1.6852 - fi
1.6853 -done
1.6854 - done
1.6855 -IFS=$as_save_IFS
1.6856 -
1.6857 - ;;
1.6858 -esac
1.6859 -fi
1.6860 -AR=$ac_cv_path_AR
1.6861 -if test -n "$AR"; then
1.6862 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
1.6863 -$as_echo "$AR" >&6; }
1.6864 -else
1.6865 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.6866 -$as_echo "no" >&6; }
1.6867 -fi
1.6868 -
1.6869 -
1.6870 - if test "x$AR" = x; then
1.6871 - as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.6872 - fi
1.6873 - else
1.6874 - # Otherwise we believe it is a complete path. Use it as it is.
1.6875 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool AR=$tool_specified" >&5
1.6876 -$as_echo "$as_me: Will use user supplied tool AR=$tool_specified" >&6;}
1.6877 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AR" >&5
1.6878 -$as_echo_n "checking for AR... " >&6; }
1.6879 - if test ! -x "$tool_specified"; then
1.6880 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.6881 -$as_echo "not found" >&6; }
1.6882 - as_fn_error $? "User supplied tool AR=$tool_specified does not exist or is not executable" "$LINENO" 5
1.6883 - fi
1.6884 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.6885 -$as_echo "$tool_specified" >&6; }
1.6886 - fi
1.6887 - fi
1.6888 - fi
1.6889 -
1.6890 -
1.6891 -
1.6892 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.6893 -
1.6894 - # First separate the path from the arguments. This will split at the first
1.6895 - # space.
1.6896 - complete="$AR"
1.6897 +
1.6898 +
1.6899 + # Publish this variable in the help.
1.6900 +
1.6901 +
1.6902 + if test "x$LIPO" = x; then
1.6903 + # The variable is not set by user, try to locate tool using the code snippet
1.6904 + for ac_prog in lipo
1.6905 +do
1.6906 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.6907 +set dummy $ac_prog; ac_word=$2
1.6908 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.6909 +$as_echo_n "checking for $ac_word... " >&6; }
1.6910 +if ${ac_cv_path_LIPO+:} false; then :
1.6911 + $as_echo_n "(cached) " >&6
1.6912 +else
1.6913 + case $LIPO in
1.6914 + [\\/]* | ?:[\\/]*)
1.6915 + ac_cv_path_LIPO="$LIPO" # Let the user override the test with a path.
1.6916 + ;;
1.6917 + *)
1.6918 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.6919 +for as_dir in $PATH
1.6920 +do
1.6921 + IFS=$as_save_IFS
1.6922 + test -z "$as_dir" && as_dir=.
1.6923 + for ac_exec_ext in '' $ac_executable_extensions; do
1.6924 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.6925 + ac_cv_path_LIPO="$as_dir/$ac_word$ac_exec_ext"
1.6926 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.6927 + break 2
1.6928 + fi
1.6929 +done
1.6930 + done
1.6931 +IFS=$as_save_IFS
1.6932 +
1.6933 + ;;
1.6934 +esac
1.6935 +fi
1.6936 +LIPO=$ac_cv_path_LIPO
1.6937 +if test -n "$LIPO"; then
1.6938 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
1.6939 +$as_echo "$LIPO" >&6; }
1.6940 +else
1.6941 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.6942 +$as_echo "no" >&6; }
1.6943 +fi
1.6944 +
1.6945 +
1.6946 + test -n "$LIPO" && break
1.6947 +done
1.6948 +
1.6949 + else
1.6950 + # The variable is set, but is it from the command line or the environment?
1.6951 +
1.6952 + # Try to remove the string !LIPO! from our list.
1.6953 + try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!LIPO!/}
1.6954 + if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.6955 + # If it failed, the variable was not from the command line. Ignore it,
1.6956 + # but warn the user (except for BASH, which is always set by the calling BASH).
1.6957 + if test "xLIPO" != xBASH; then
1.6958 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of LIPO from the environment. Use command line variables instead." >&5
1.6959 +$as_echo "$as_me: WARNING: Ignoring value of LIPO from the environment. Use command line variables instead." >&2;}
1.6960 + fi
1.6961 + # Try to locate tool using the code snippet
1.6962 + for ac_prog in lipo
1.6963 +do
1.6964 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.6965 +set dummy $ac_prog; ac_word=$2
1.6966 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.6967 +$as_echo_n "checking for $ac_word... " >&6; }
1.6968 +if ${ac_cv_path_LIPO+:} false; then :
1.6969 + $as_echo_n "(cached) " >&6
1.6970 +else
1.6971 + case $LIPO in
1.6972 + [\\/]* | ?:[\\/]*)
1.6973 + ac_cv_path_LIPO="$LIPO" # Let the user override the test with a path.
1.6974 + ;;
1.6975 + *)
1.6976 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.6977 +for as_dir in $PATH
1.6978 +do
1.6979 + IFS=$as_save_IFS
1.6980 + test -z "$as_dir" && as_dir=.
1.6981 + for ac_exec_ext in '' $ac_executable_extensions; do
1.6982 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.6983 + ac_cv_path_LIPO="$as_dir/$ac_word$ac_exec_ext"
1.6984 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.6985 + break 2
1.6986 + fi
1.6987 +done
1.6988 + done
1.6989 +IFS=$as_save_IFS
1.6990 +
1.6991 + ;;
1.6992 +esac
1.6993 +fi
1.6994 +LIPO=$ac_cv_path_LIPO
1.6995 +if test -n "$LIPO"; then
1.6996 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
1.6997 +$as_echo "$LIPO" >&6; }
1.6998 +else
1.6999 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.7000 +$as_echo "no" >&6; }
1.7001 +fi
1.7002 +
1.7003 +
1.7004 + test -n "$LIPO" && break
1.7005 +done
1.7006 +
1.7007 + else
1.7008 + # If it succeeded, then it was overridden by the user. We will use it
1.7009 + # for the tool.
1.7010 +
1.7011 + # First remove it from the list of overridden variables, so we can test
1.7012 + # for unknown variables in the end.
1.7013 + CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.7014 +
1.7015 + # Check if the provided tool contains a complete path.
1.7016 + tool_specified="$LIPO"
1.7017 + tool_basename="${tool_specified##*/}"
1.7018 + if test "x$tool_basename" = "x$tool_specified"; then
1.7019 + # A command without a complete path is provided, search $PATH.
1.7020 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool LIPO=$tool_basename" >&5
1.7021 +$as_echo "$as_me: Will search for user supplied tool LIPO=$tool_basename" >&6;}
1.7022 + # Extract the first word of "$tool_basename", so it can be a program name with args.
1.7023 +set dummy $tool_basename; ac_word=$2
1.7024 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.7025 +$as_echo_n "checking for $ac_word... " >&6; }
1.7026 +if ${ac_cv_path_LIPO+:} false; then :
1.7027 + $as_echo_n "(cached) " >&6
1.7028 +else
1.7029 + case $LIPO in
1.7030 + [\\/]* | ?:[\\/]*)
1.7031 + ac_cv_path_LIPO="$LIPO" # Let the user override the test with a path.
1.7032 + ;;
1.7033 + *)
1.7034 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.7035 +for as_dir in $PATH
1.7036 +do
1.7037 + IFS=$as_save_IFS
1.7038 + test -z "$as_dir" && as_dir=.
1.7039 + for ac_exec_ext in '' $ac_executable_extensions; do
1.7040 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.7041 + ac_cv_path_LIPO="$as_dir/$ac_word$ac_exec_ext"
1.7042 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.7043 + break 2
1.7044 + fi
1.7045 +done
1.7046 + done
1.7047 +IFS=$as_save_IFS
1.7048 +
1.7049 + ;;
1.7050 +esac
1.7051 +fi
1.7052 +LIPO=$ac_cv_path_LIPO
1.7053 +if test -n "$LIPO"; then
1.7054 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
1.7055 +$as_echo "$LIPO" >&6; }
1.7056 +else
1.7057 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.7058 +$as_echo "no" >&6; }
1.7059 +fi
1.7060 +
1.7061 +
1.7062 + if test "x$LIPO" = x; then
1.7063 + as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.7064 + fi
1.7065 + else
1.7066 + # Otherwise we believe it is a complete path. Use it as it is.
1.7067 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool LIPO=$tool_specified" >&5
1.7068 +$as_echo "$as_me: Will use user supplied tool LIPO=$tool_specified" >&6;}
1.7069 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIPO" >&5
1.7070 +$as_echo_n "checking for LIPO... " >&6; }
1.7071 + if test ! -x "$tool_specified"; then
1.7072 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.7073 +$as_echo "not found" >&6; }
1.7074 + as_fn_error $? "User supplied tool LIPO=$tool_specified does not exist or is not executable" "$LINENO" 5
1.7075 + fi
1.7076 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.7077 +$as_echo "$tool_specified" >&6; }
1.7078 + fi
1.7079 + fi
1.7080 + fi
1.7081 +
1.7082 +
1.7083 +
1.7084 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.7085 +
1.7086 + # First separate the path from the arguments. This will split at the first
1.7087 + # space.
1.7088 + complete="$LIPO"
1.7089 path="${complete%% *}"
1.7090 tmp="$complete EOL"
1.7091 arguments="${tmp#* }"
1.7092 @@ -31742,14 +32112,14 @@
1.7093 fi
1.7094 if test "x$new_path" = x; then
1.7095 # It's still not found. Now this is an unrecoverable error.
1.7096 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$complete\", is not found." >&5
1.7097 -$as_echo "$as_me: The path of AR, which resolves as \"$complete\", is not found." >&6;}
1.7098 - has_space=`$ECHO "$complete" | $GREP " "`
1.7099 - if test "x$has_space" != x; then
1.7100 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.7101 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.7102 - fi
1.7103 - as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5
1.7104 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$complete\", is not found." >&5
1.7105 +$as_echo "$as_me: The path of LIPO, which resolves as \"$complete\", is not found." >&6;}
1.7106 + has_space=`$ECHO "$complete" | $GREP " "`
1.7107 + if test "x$has_space" != x; then
1.7108 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.7109 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.7110 + fi
1.7111 + as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5
1.7112 fi
1.7113 fi
1.7114
1.7115 @@ -31769,11 +32139,11 @@
1.7116 elif test -f "${new_path}.cmd"; then
1.7117 input_to_shortpath="${new_path}.cmd"
1.7118 else
1.7119 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$new_path\", is invalid." >&5
1.7120 -$as_echo "$as_me: The path of AR, which resolves as \"$new_path\", is invalid." >&6;}
1.7121 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$new_path\", is invalid." >&5
1.7122 +$as_echo "$as_me: The path of LIPO, which resolves as \"$new_path\", is invalid." >&6;}
1.7123 { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.7124 $as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.7125 - as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5
1.7126 + as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5
1.7127 fi
1.7128 else
1.7129 input_to_shortpath="$new_path"
1.7130 @@ -31820,7 +32190,7 @@
1.7131
1.7132 # First separate the path from the arguments. This will split at the first
1.7133 # space.
1.7134 - complete="$AR"
1.7135 + complete="$LIPO"
1.7136 path="${complete%% *}"
1.7137 tmp="$complete EOL"
1.7138 arguments="${tmp#* }"
1.7139 @@ -31865,14 +32235,14 @@
1.7140
1.7141 if test "x$new_path" = x; then
1.7142 # It's still not found. Now this is an unrecoverable error.
1.7143 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$complete\", is not found." >&5
1.7144 -$as_echo "$as_me: The path of AR, which resolves as \"$complete\", is not found." >&6;}
1.7145 - has_space=`$ECHO "$complete" | $GREP " "`
1.7146 - if test "x$has_space" != x; then
1.7147 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.7148 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.7149 - fi
1.7150 - as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5
1.7151 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$complete\", is not found." >&5
1.7152 +$as_echo "$as_me: The path of LIPO, which resolves as \"$complete\", is not found." >&6;}
1.7153 + has_space=`$ECHO "$complete" | $GREP " "`
1.7154 + if test "x$has_space" != x; then
1.7155 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.7156 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.7157 + fi
1.7158 + as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5
1.7159 fi
1.7160 fi
1.7161
1.7162 @@ -31918,7 +32288,7 @@
1.7163 # We're on a posix platform. Hooray! :)
1.7164 # First separate the path from the arguments. This will split at the first
1.7165 # space.
1.7166 - complete="$AR"
1.7167 + complete="$LIPO"
1.7168 path="${complete%% *}"
1.7169 tmp="$complete EOL"
1.7170 arguments="${tmp#* }"
1.7171 @@ -31937,20 +32307,19 @@
1.7172 done
1.7173 IFS="$IFS_save"
1.7174 else
1.7175 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving AR (as $path) failed, using $path directly." >&5
1.7176 -$as_echo "$as_me: Resolving AR (as $path) failed, using $path directly." >&6;}
1.7177 + # This is an absolute path, we can use it without further modifications.
1.7178 new_path="$path"
1.7179 fi
1.7180
1.7181 if test "x$new_path" = x; then
1.7182 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$complete\", is not found." >&5
1.7183 -$as_echo "$as_me: The path of AR, which resolves as \"$complete\", is not found." >&6;}
1.7184 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$complete\", is not found." >&5
1.7185 +$as_echo "$as_me: The path of LIPO, which resolves as \"$complete\", is not found." >&6;}
1.7186 has_space=`$ECHO "$complete" | $GREP " "`
1.7187 if test "x$has_space" != x; then
1.7188 { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7189 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.7190 fi
1.7191 - as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5
1.7192 + as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5
1.7193 fi
1.7194 fi
1.7195
1.7196 @@ -31962,47 +32331,25 @@
1.7197 fi
1.7198
1.7199 if test "x$complete" != "x$new_complete"; then
1.7200 - AR="$new_complete"
1.7201 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AR to \"$new_complete\"" >&5
1.7202 -$as_echo "$as_me: Rewriting AR to \"$new_complete\"" >&6;}
1.7203 - fi
1.7204 -
1.7205 - fi
1.7206 - if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.7207 - ARFLAGS="-r"
1.7208 - elif test "x$OPENJDK_TARGET_OS" = xaix; then
1.7209 - ARFLAGS="-X64"
1.7210 - else
1.7211 - ARFLAGS=""
1.7212 - fi
1.7213 -
1.7214 -
1.7215 - # For hotspot, we need these in Windows mixed path; other platforms keep them the same
1.7216 - HOTSPOT_CXX="$CXX"
1.7217 - HOTSPOT_LD="$LD"
1.7218 -
1.7219 -
1.7220 -
1.7221 - COMPILER_NAME=gcc
1.7222 - COMPILER_TYPE=CC
1.7223 - if test "x$OPENJDK_TARGET_OS" = xwindows; then :
1.7224 -
1.7225 - # For now, assume that we are always compiling using cl.exe.
1.7226 - CC_OUT_OPTION=-Fo
1.7227 - EXE_OUT_OPTION=-out:
1.7228 - LD_OUT_OPTION=-out:
1.7229 - AR_OUT_OPTION=-out:
1.7230 - # On Windows, reject /usr/bin/link (as determined in CYGWIN_LINK), which is a cygwin
1.7231 - # program for something completely different.
1.7232 - # Extract the first word of "link", so it can be a program name with args.
1.7233 -set dummy link; ac_word=$2
1.7234 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.7235 -$as_echo_n "checking for $ac_word... " >&6; }
1.7236 -if ${ac_cv_prog_WINLD+:} false; then :
1.7237 - $as_echo_n "(cached) " >&6
1.7238 -else
1.7239 - if test -n "$WINLD"; then
1.7240 - ac_cv_prog_WINLD="$WINLD" # Let the user override the test.
1.7241 + LIPO="$new_complete"
1.7242 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting LIPO to \"$new_complete\"" >&5
1.7243 +$as_echo "$as_me: Rewriting LIPO to \"$new_complete\"" >&6;}
1.7244 + fi
1.7245 +
1.7246 + else
1.7247 + OBJC=
1.7248 + fi
1.7249 +
1.7250 + if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.7251 + # Extract the first word of "mt", so it can be a program name with args.
1.7252 +set dummy mt; ac_word=$2
1.7253 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.7254 +$as_echo_n "checking for $ac_word... " >&6; }
1.7255 +if ${ac_cv_prog_MT+:} false; then :
1.7256 + $as_echo_n "(cached) " >&6
1.7257 +else
1.7258 + if test -n "$MT"; then
1.7259 + ac_cv_prog_MT="$MT" # Let the user override the test.
1.7260 else
1.7261 ac_prog_rejected=no
1.7262 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.7263 @@ -32012,11 +32359,11 @@
1.7264 test -z "$as_dir" && as_dir=.
1.7265 for ac_exec_ext in '' $ac_executable_extensions; do
1.7266 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.7267 - if test "$as_dir/$ac_word$ac_exec_ext" = "$CYGWIN_LINK"; then
1.7268 + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/bin/mt"; then
1.7269 ac_prog_rejected=yes
1.7270 continue
1.7271 fi
1.7272 - ac_cv_prog_WINLD="link"
1.7273 + ac_cv_prog_MT="mt"
1.7274 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.7275 break 2
1.7276 fi
1.7277 @@ -32026,36 +32373,34 @@
1.7278
1.7279 if test $ac_prog_rejected = yes; then
1.7280 # We found a bogon in the path, so make sure we never use it.
1.7281 - set dummy $ac_cv_prog_WINLD
1.7282 + set dummy $ac_cv_prog_MT
1.7283 shift
1.7284 if test $# != 0; then
1.7285 # We chose a different compiler from the bogus one.
1.7286 # However, it has the same basename, so the bogon will be chosen
1.7287 - # first if we set WINLD to just the basename; use the full file name.
1.7288 + # first if we set MT to just the basename; use the full file name.
1.7289 shift
1.7290 - ac_cv_prog_WINLD="$as_dir/$ac_word${1+' '}$@"
1.7291 - fi
1.7292 -fi
1.7293 -fi
1.7294 -fi
1.7295 -WINLD=$ac_cv_prog_WINLD
1.7296 -if test -n "$WINLD"; then
1.7297 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINLD" >&5
1.7298 -$as_echo "$WINLD" >&6; }
1.7299 -else
1.7300 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.7301 -$as_echo "no" >&6; }
1.7302 -fi
1.7303 -
1.7304 -
1.7305 - # Since we must ignore the first found link, WINLD will contain
1.7306 - # the full path to the link.exe program.
1.7307 -
1.7308 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.7309 -
1.7310 - # First separate the path from the arguments. This will split at the first
1.7311 - # space.
1.7312 - complete="$WINLD"
1.7313 + ac_cv_prog_MT="$as_dir/$ac_word${1+' '}$@"
1.7314 + fi
1.7315 +fi
1.7316 +fi
1.7317 +fi
1.7318 +MT=$ac_cv_prog_MT
1.7319 +if test -n "$MT"; then
1.7320 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MT" >&5
1.7321 +$as_echo "$MT" >&6; }
1.7322 +else
1.7323 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.7324 +$as_echo "no" >&6; }
1.7325 +fi
1.7326 +
1.7327 +
1.7328 +
1.7329 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.7330 +
1.7331 + # First separate the path from the arguments. This will split at the first
1.7332 + # space.
1.7333 + complete="$MT"
1.7334 path="${complete%% *}"
1.7335 tmp="$complete EOL"
1.7336 arguments="${tmp#* }"
1.7337 @@ -32091,14 +32436,14 @@
1.7338 fi
1.7339 if test "x$new_path" = x; then
1.7340 # It's still not found. Now this is an unrecoverable error.
1.7341 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINLD, which resolves as \"$complete\", is not found." >&5
1.7342 -$as_echo "$as_me: The path of WINLD, which resolves as \"$complete\", is not found." >&6;}
1.7343 - has_space=`$ECHO "$complete" | $GREP " "`
1.7344 - if test "x$has_space" != x; then
1.7345 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.7346 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.7347 - fi
1.7348 - as_fn_error $? "Cannot locate the the path of WINLD" "$LINENO" 5
1.7349 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$complete\", is not found." >&5
1.7350 +$as_echo "$as_me: The path of MT, which resolves as \"$complete\", is not found." >&6;}
1.7351 + has_space=`$ECHO "$complete" | $GREP " "`
1.7352 + if test "x$has_space" != x; then
1.7353 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.7354 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.7355 + fi
1.7356 + as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5
1.7357 fi
1.7358 fi
1.7359
1.7360 @@ -32118,11 +32463,11 @@
1.7361 elif test -f "${new_path}.cmd"; then
1.7362 input_to_shortpath="${new_path}.cmd"
1.7363 else
1.7364 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINLD, which resolves as \"$new_path\", is invalid." >&5
1.7365 -$as_echo "$as_me: The path of WINLD, which resolves as \"$new_path\", is invalid." >&6;}
1.7366 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$new_path\", is invalid." >&5
1.7367 +$as_echo "$as_me: The path of MT, which resolves as \"$new_path\", is invalid." >&6;}
1.7368 { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.7369 $as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.7370 - as_fn_error $? "Cannot locate the the path of WINLD" "$LINENO" 5
1.7371 + as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5
1.7372 fi
1.7373 else
1.7374 input_to_shortpath="$new_path"
1.7375 @@ -32169,7 +32514,7 @@
1.7376
1.7377 # First separate the path from the arguments. This will split at the first
1.7378 # space.
1.7379 - complete="$WINLD"
1.7380 + complete="$MT"
1.7381 path="${complete%% *}"
1.7382 tmp="$complete EOL"
1.7383 arguments="${tmp#* }"
1.7384 @@ -32214,14 +32559,14 @@
1.7385
1.7386 if test "x$new_path" = x; then
1.7387 # It's still not found. Now this is an unrecoverable error.
1.7388 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINLD, which resolves as \"$complete\", is not found." >&5
1.7389 -$as_echo "$as_me: The path of WINLD, which resolves as \"$complete\", is not found." >&6;}
1.7390 - has_space=`$ECHO "$complete" | $GREP " "`
1.7391 - if test "x$has_space" != x; then
1.7392 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.7393 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.7394 - fi
1.7395 - as_fn_error $? "Cannot locate the the path of WINLD" "$LINENO" 5
1.7396 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$complete\", is not found." >&5
1.7397 +$as_echo "$as_me: The path of MT, which resolves as \"$complete\", is not found." >&6;}
1.7398 + has_space=`$ECHO "$complete" | $GREP " "`
1.7399 + if test "x$has_space" != x; then
1.7400 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.7401 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.7402 + fi
1.7403 + as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5
1.7404 fi
1.7405 fi
1.7406
1.7407 @@ -32267,7 +32612,7 @@
1.7408 # We're on a posix platform. Hooray! :)
1.7409 # First separate the path from the arguments. This will split at the first
1.7410 # space.
1.7411 - complete="$WINLD"
1.7412 + complete="$MT"
1.7413 path="${complete%% *}"
1.7414 tmp="$complete EOL"
1.7415 arguments="${tmp#* }"
1.7416 @@ -32286,20 +32631,19 @@
1.7417 done
1.7418 IFS="$IFS_save"
1.7419 else
1.7420 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving WINLD (as $path) failed, using $path directly." >&5
1.7421 -$as_echo "$as_me: Resolving WINLD (as $path) failed, using $path directly." >&6;}
1.7422 + # This is an absolute path, we can use it without further modifications.
1.7423 new_path="$path"
1.7424 fi
1.7425
1.7426 if test "x$new_path" = x; then
1.7427 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINLD, which resolves as \"$complete\", is not found." >&5
1.7428 -$as_echo "$as_me: The path of WINLD, which resolves as \"$complete\", is not found." >&6;}
1.7429 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$complete\", is not found." >&5
1.7430 +$as_echo "$as_me: The path of MT, which resolves as \"$complete\", is not found." >&6;}
1.7431 has_space=`$ECHO "$complete" | $GREP " "`
1.7432 if test "x$has_space" != x; then
1.7433 { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7434 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.7435 fi
1.7436 - as_fn_error $? "Cannot locate the the path of WINLD" "$LINENO" 5
1.7437 + as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5
1.7438 fi
1.7439 fi
1.7440
1.7441 @@ -32311,37 +32655,21 @@
1.7442 fi
1.7443
1.7444 if test "x$complete" != "x$new_complete"; then
1.7445 - WINLD="$new_complete"
1.7446 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting WINLD to \"$new_complete\"" >&5
1.7447 -$as_echo "$as_me: Rewriting WINLD to \"$new_complete\"" >&6;}
1.7448 - fi
1.7449 -
1.7450 - printf "Windows linker was found at $WINLD\n"
1.7451 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the found link.exe is actually the Visual Studio linker" >&5
1.7452 -$as_echo_n "checking if the found link.exe is actually the Visual Studio linker... " >&6; }
1.7453 - "$WINLD" --version > /dev/null
1.7454 - if test $? -eq 0 ; then
1.7455 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.7456 -$as_echo "no" >&6; }
1.7457 - as_fn_error $? "This is the Cygwin link tool. Please check your PATH and rerun configure." "$LINENO" 5
1.7458 - else
1.7459 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.7460 -$as_echo "yes" >&6; }
1.7461 - fi
1.7462 - LD="$WINLD"
1.7463 - LDEXE="$WINLD"
1.7464 - LDCXX="$WINLD"
1.7465 - LDEXECXX="$WINLD"
1.7466 -
1.7467 - # Extract the first word of "mt", so it can be a program name with args.
1.7468 -set dummy mt; ac_word=$2
1.7469 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.7470 -$as_echo_n "checking for $ac_word... " >&6; }
1.7471 -if ${ac_cv_prog_MT+:} false; then :
1.7472 - $as_echo_n "(cached) " >&6
1.7473 -else
1.7474 - if test -n "$MT"; then
1.7475 - ac_cv_prog_MT="$MT" # Let the user override the test.
1.7476 + MT="$new_complete"
1.7477 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MT to \"$new_complete\"" >&5
1.7478 +$as_echo "$as_me: Rewriting MT to \"$new_complete\"" >&6;}
1.7479 + fi
1.7480 +
1.7481 + # Setup the resource compiler (RC)
1.7482 + # Extract the first word of "rc", so it can be a program name with args.
1.7483 +set dummy rc; ac_word=$2
1.7484 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.7485 +$as_echo_n "checking for $ac_word... " >&6; }
1.7486 +if ${ac_cv_prog_RC+:} false; then :
1.7487 + $as_echo_n "(cached) " >&6
1.7488 +else
1.7489 + if test -n "$RC"; then
1.7490 + ac_cv_prog_RC="$RC" # Let the user override the test.
1.7491 else
1.7492 ac_prog_rejected=no
1.7493 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.7494 @@ -32351,11 +32679,11 @@
1.7495 test -z "$as_dir" && as_dir=.
1.7496 for ac_exec_ext in '' $ac_executable_extensions; do
1.7497 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.7498 - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/bin/mt"; then
1.7499 + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/bin/rc"; then
1.7500 ac_prog_rejected=yes
1.7501 continue
1.7502 fi
1.7503 - ac_cv_prog_MT="mt"
1.7504 + ac_cv_prog_RC="rc"
1.7505 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.7506 break 2
1.7507 fi
1.7508 @@ -32365,34 +32693,34 @@
1.7509
1.7510 if test $ac_prog_rejected = yes; then
1.7511 # We found a bogon in the path, so make sure we never use it.
1.7512 - set dummy $ac_cv_prog_MT
1.7513 + set dummy $ac_cv_prog_RC
1.7514 shift
1.7515 if test $# != 0; then
1.7516 # We chose a different compiler from the bogus one.
1.7517 # However, it has the same basename, so the bogon will be chosen
1.7518 - # first if we set MT to just the basename; use the full file name.
1.7519 + # first if we set RC to just the basename; use the full file name.
1.7520 shift
1.7521 - ac_cv_prog_MT="$as_dir/$ac_word${1+' '}$@"
1.7522 - fi
1.7523 -fi
1.7524 -fi
1.7525 -fi
1.7526 -MT=$ac_cv_prog_MT
1.7527 -if test -n "$MT"; then
1.7528 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MT" >&5
1.7529 -$as_echo "$MT" >&6; }
1.7530 -else
1.7531 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.7532 -$as_echo "no" >&6; }
1.7533 -fi
1.7534 -
1.7535 -
1.7536 -
1.7537 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.7538 -
1.7539 - # First separate the path from the arguments. This will split at the first
1.7540 - # space.
1.7541 - complete="$MT"
1.7542 + ac_cv_prog_RC="$as_dir/$ac_word${1+' '}$@"
1.7543 + fi
1.7544 +fi
1.7545 +fi
1.7546 +fi
1.7547 +RC=$ac_cv_prog_RC
1.7548 +if test -n "$RC"; then
1.7549 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
1.7550 +$as_echo "$RC" >&6; }
1.7551 +else
1.7552 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.7553 +$as_echo "no" >&6; }
1.7554 +fi
1.7555 +
1.7556 +
1.7557 +
1.7558 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.7559 +
1.7560 + # First separate the path from the arguments. This will split at the first
1.7561 + # space.
1.7562 + complete="$RC"
1.7563 path="${complete%% *}"
1.7564 tmp="$complete EOL"
1.7565 arguments="${tmp#* }"
1.7566 @@ -32428,14 +32756,14 @@
1.7567 fi
1.7568 if test "x$new_path" = x; then
1.7569 # It's still not found. Now this is an unrecoverable error.
1.7570 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$complete\", is not found." >&5
1.7571 -$as_echo "$as_me: The path of MT, which resolves as \"$complete\", is not found." >&6;}
1.7572 - has_space=`$ECHO "$complete" | $GREP " "`
1.7573 - if test "x$has_space" != x; then
1.7574 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.7575 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.7576 - fi
1.7577 - as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5
1.7578 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$complete\", is not found." >&5
1.7579 +$as_echo "$as_me: The path of RC, which resolves as \"$complete\", is not found." >&6;}
1.7580 + has_space=`$ECHO "$complete" | $GREP " "`
1.7581 + if test "x$has_space" != x; then
1.7582 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.7583 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.7584 + fi
1.7585 + as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5
1.7586 fi
1.7587 fi
1.7588
1.7589 @@ -32455,11 +32783,11 @@
1.7590 elif test -f "${new_path}.cmd"; then
1.7591 input_to_shortpath="${new_path}.cmd"
1.7592 else
1.7593 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$new_path\", is invalid." >&5
1.7594 -$as_echo "$as_me: The path of MT, which resolves as \"$new_path\", is invalid." >&6;}
1.7595 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$new_path\", is invalid." >&5
1.7596 +$as_echo "$as_me: The path of RC, which resolves as \"$new_path\", is invalid." >&6;}
1.7597 { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.7598 $as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.7599 - as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5
1.7600 + as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5
1.7601 fi
1.7602 else
1.7603 input_to_shortpath="$new_path"
1.7604 @@ -32506,7 +32834,7 @@
1.7605
1.7606 # First separate the path from the arguments. This will split at the first
1.7607 # space.
1.7608 - complete="$MT"
1.7609 + complete="$RC"
1.7610 path="${complete%% *}"
1.7611 tmp="$complete EOL"
1.7612 arguments="${tmp#* }"
1.7613 @@ -32551,14 +32879,14 @@
1.7614
1.7615 if test "x$new_path" = x; then
1.7616 # It's still not found. Now this is an unrecoverable error.
1.7617 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$complete\", is not found." >&5
1.7618 -$as_echo "$as_me: The path of MT, which resolves as \"$complete\", is not found." >&6;}
1.7619 - has_space=`$ECHO "$complete" | $GREP " "`
1.7620 - if test "x$has_space" != x; then
1.7621 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.7622 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.7623 - fi
1.7624 - as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5
1.7625 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$complete\", is not found." >&5
1.7626 +$as_echo "$as_me: The path of RC, which resolves as \"$complete\", is not found." >&6;}
1.7627 + has_space=`$ECHO "$complete" | $GREP " "`
1.7628 + if test "x$has_space" != x; then
1.7629 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.7630 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.7631 + fi
1.7632 + as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5
1.7633 fi
1.7634 fi
1.7635
1.7636 @@ -32604,7 +32932,7 @@
1.7637 # We're on a posix platform. Hooray! :)
1.7638 # First separate the path from the arguments. This will split at the first
1.7639 # space.
1.7640 - complete="$MT"
1.7641 + complete="$RC"
1.7642 path="${complete%% *}"
1.7643 tmp="$complete EOL"
1.7644 arguments="${tmp#* }"
1.7645 @@ -32623,20 +32951,19 @@
1.7646 done
1.7647 IFS="$IFS_save"
1.7648 else
1.7649 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving MT (as $path) failed, using $path directly." >&5
1.7650 -$as_echo "$as_me: Resolving MT (as $path) failed, using $path directly." >&6;}
1.7651 + # This is an absolute path, we can use it without further modifications.
1.7652 new_path="$path"
1.7653 fi
1.7654
1.7655 if test "x$new_path" = x; then
1.7656 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$complete\", is not found." >&5
1.7657 -$as_echo "$as_me: The path of MT, which resolves as \"$complete\", is not found." >&6;}
1.7658 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$complete\", is not found." >&5
1.7659 +$as_echo "$as_me: The path of RC, which resolves as \"$complete\", is not found." >&6;}
1.7660 has_space=`$ECHO "$complete" | $GREP " "`
1.7661 if test "x$has_space" != x; then
1.7662 { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7663 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.7664 fi
1.7665 - as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5
1.7666 + as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5
1.7667 fi
1.7668 fi
1.7669
1.7670 @@ -32648,23 +32975,21 @@
1.7671 fi
1.7672
1.7673 if test "x$complete" != "x$new_complete"; then
1.7674 - MT="$new_complete"
1.7675 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MT to \"$new_complete\"" >&5
1.7676 -$as_echo "$as_me: Rewriting MT to \"$new_complete\"" >&6;}
1.7677 - fi
1.7678 -
1.7679 - # The resource compiler
1.7680 - # Extract the first word of "rc", so it can be a program name with args.
1.7681 -set dummy rc; ac_word=$2
1.7682 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.7683 -$as_echo_n "checking for $ac_word... " >&6; }
1.7684 -if ${ac_cv_prog_RC+:} false; then :
1.7685 - $as_echo_n "(cached) " >&6
1.7686 -else
1.7687 - if test -n "$RC"; then
1.7688 - ac_cv_prog_RC="$RC" # Let the user override the test.
1.7689 -else
1.7690 - ac_prog_rejected=no
1.7691 + RC="$new_complete"
1.7692 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting RC to \"$new_complete\"" >&5
1.7693 +$as_echo "$as_me: Rewriting RC to \"$new_complete\"" >&6;}
1.7694 + fi
1.7695 +
1.7696 + # Extract the first word of "dumpbin", so it can be a program name with args.
1.7697 +set dummy dumpbin; ac_word=$2
1.7698 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.7699 +$as_echo_n "checking for $ac_word... " >&6; }
1.7700 +if ${ac_cv_prog_DUMPBIN+:} false; then :
1.7701 + $as_echo_n "(cached) " >&6
1.7702 +else
1.7703 + if test -n "$DUMPBIN"; then
1.7704 + ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
1.7705 +else
1.7706 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.7707 for as_dir in $PATH
1.7708 do
1.7709 @@ -32672,48 +32997,32 @@
1.7710 test -z "$as_dir" && as_dir=.
1.7711 for ac_exec_ext in '' $ac_executable_extensions; do
1.7712 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.7713 - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/bin/rc"; then
1.7714 - ac_prog_rejected=yes
1.7715 - continue
1.7716 - fi
1.7717 - ac_cv_prog_RC="rc"
1.7718 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.7719 - break 2
1.7720 - fi
1.7721 -done
1.7722 - done
1.7723 -IFS=$as_save_IFS
1.7724 -
1.7725 -if test $ac_prog_rejected = yes; then
1.7726 - # We found a bogon in the path, so make sure we never use it.
1.7727 - set dummy $ac_cv_prog_RC
1.7728 - shift
1.7729 - if test $# != 0; then
1.7730 - # We chose a different compiler from the bogus one.
1.7731 - # However, it has the same basename, so the bogon will be chosen
1.7732 - # first if we set RC to just the basename; use the full file name.
1.7733 - shift
1.7734 - ac_cv_prog_RC="$as_dir/$ac_word${1+' '}$@"
1.7735 - fi
1.7736 -fi
1.7737 -fi
1.7738 -fi
1.7739 -RC=$ac_cv_prog_RC
1.7740 -if test -n "$RC"; then
1.7741 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
1.7742 -$as_echo "$RC" >&6; }
1.7743 -else
1.7744 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.7745 -$as_echo "no" >&6; }
1.7746 -fi
1.7747 -
1.7748 -
1.7749 -
1.7750 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.7751 -
1.7752 - # First separate the path from the arguments. This will split at the first
1.7753 - # space.
1.7754 - complete="$RC"
1.7755 + ac_cv_prog_DUMPBIN="dumpbin"
1.7756 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.7757 + break 2
1.7758 + fi
1.7759 +done
1.7760 + done
1.7761 +IFS=$as_save_IFS
1.7762 +
1.7763 +fi
1.7764 +fi
1.7765 +DUMPBIN=$ac_cv_prog_DUMPBIN
1.7766 +if test -n "$DUMPBIN"; then
1.7767 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
1.7768 +$as_echo "$DUMPBIN" >&6; }
1.7769 +else
1.7770 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.7771 +$as_echo "no" >&6; }
1.7772 +fi
1.7773 +
1.7774 +
1.7775 +
1.7776 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.7777 +
1.7778 + # First separate the path from the arguments. This will split at the first
1.7779 + # space.
1.7780 + complete="$DUMPBIN"
1.7781 path="${complete%% *}"
1.7782 tmp="$complete EOL"
1.7783 arguments="${tmp#* }"
1.7784 @@ -32749,14 +33058,14 @@
1.7785 fi
1.7786 if test "x$new_path" = x; then
1.7787 # It's still not found. Now this is an unrecoverable error.
1.7788 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$complete\", is not found." >&5
1.7789 -$as_echo "$as_me: The path of RC, which resolves as \"$complete\", is not found." >&6;}
1.7790 - has_space=`$ECHO "$complete" | $GREP " "`
1.7791 - if test "x$has_space" != x; then
1.7792 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.7793 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.7794 - fi
1.7795 - as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5
1.7796 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&5
1.7797 +$as_echo "$as_me: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&6;}
1.7798 + has_space=`$ECHO "$complete" | $GREP " "`
1.7799 + if test "x$has_space" != x; then
1.7800 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.7801 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.7802 + fi
1.7803 + as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5
1.7804 fi
1.7805 fi
1.7806
1.7807 @@ -32776,11 +33085,11 @@
1.7808 elif test -f "${new_path}.cmd"; then
1.7809 input_to_shortpath="${new_path}.cmd"
1.7810 else
1.7811 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$new_path\", is invalid." >&5
1.7812 -$as_echo "$as_me: The path of RC, which resolves as \"$new_path\", is invalid." >&6;}
1.7813 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$new_path\", is invalid." >&5
1.7814 +$as_echo "$as_me: The path of DUMPBIN, which resolves as \"$new_path\", is invalid." >&6;}
1.7815 { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.7816 $as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.7817 - as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5
1.7818 + as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5
1.7819 fi
1.7820 else
1.7821 input_to_shortpath="$new_path"
1.7822 @@ -32827,7 +33136,7 @@
1.7823
1.7824 # First separate the path from the arguments. This will split at the first
1.7825 # space.
1.7826 - complete="$RC"
1.7827 + complete="$DUMPBIN"
1.7828 path="${complete%% *}"
1.7829 tmp="$complete EOL"
1.7830 arguments="${tmp#* }"
1.7831 @@ -32872,14 +33181,14 @@
1.7832
1.7833 if test "x$new_path" = x; then
1.7834 # It's still not found. Now this is an unrecoverable error.
1.7835 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$complete\", is not found." >&5
1.7836 -$as_echo "$as_me: The path of RC, which resolves as \"$complete\", is not found." >&6;}
1.7837 - has_space=`$ECHO "$complete" | $GREP " "`
1.7838 - if test "x$has_space" != x; then
1.7839 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.7840 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.7841 - fi
1.7842 - as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5
1.7843 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&5
1.7844 +$as_echo "$as_me: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&6;}
1.7845 + has_space=`$ECHO "$complete" | $GREP " "`
1.7846 + if test "x$has_space" != x; then
1.7847 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.7848 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.7849 + fi
1.7850 + as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5
1.7851 fi
1.7852 fi
1.7853
1.7854 @@ -32925,7 +33234,7 @@
1.7855 # We're on a posix platform. Hooray! :)
1.7856 # First separate the path from the arguments. This will split at the first
1.7857 # space.
1.7858 - complete="$RC"
1.7859 + complete="$DUMPBIN"
1.7860 path="${complete%% *}"
1.7861 tmp="$complete EOL"
1.7862 arguments="${tmp#* }"
1.7863 @@ -32944,20 +33253,19 @@
1.7864 done
1.7865 IFS="$IFS_save"
1.7866 else
1.7867 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving RC (as $path) failed, using $path directly." >&5
1.7868 -$as_echo "$as_me: Resolving RC (as $path) failed, using $path directly." >&6;}
1.7869 + # This is an absolute path, we can use it without further modifications.
1.7870 new_path="$path"
1.7871 fi
1.7872
1.7873 if test "x$new_path" = x; then
1.7874 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$complete\", is not found." >&5
1.7875 -$as_echo "$as_me: The path of RC, which resolves as \"$complete\", is not found." >&6;}
1.7876 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&5
1.7877 +$as_echo "$as_me: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&6;}
1.7878 has_space=`$ECHO "$complete" | $GREP " "`
1.7879 if test "x$has_space" != x; then
1.7880 { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.7881 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.7882 fi
1.7883 - as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5
1.7884 + as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5
1.7885 fi
1.7886 fi
1.7887
1.7888 @@ -32969,126 +33277,206 @@
1.7889 fi
1.7890
1.7891 if test "x$complete" != "x$new_complete"; then
1.7892 - RC="$new_complete"
1.7893 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting RC to \"$new_complete\"" >&5
1.7894 -$as_echo "$as_me: Rewriting RC to \"$new_complete\"" >&6;}
1.7895 - fi
1.7896 -
1.7897 -
1.7898 - # For hotspot, we need these in Windows mixed path,
1.7899 - # so rewrite them all. Need added .exe suffix.
1.7900 - HOTSPOT_CXX="$CXX.exe"
1.7901 - HOTSPOT_LD="$LD.exe"
1.7902 - HOTSPOT_MT="$MT.exe"
1.7903 - HOTSPOT_RC="$RC.exe"
1.7904 -
1.7905 - unix_path="$HOTSPOT_CXX"
1.7906 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.7907 - windows_path=`$CYGPATH -m "$unix_path"`
1.7908 - HOTSPOT_CXX="$windows_path"
1.7909 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.7910 - windows_path=`cmd //c echo $unix_path`
1.7911 - HOTSPOT_CXX="$windows_path"
1.7912 - fi
1.7913 -
1.7914 -
1.7915 - unix_path="$HOTSPOT_LD"
1.7916 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.7917 - windows_path=`$CYGPATH -m "$unix_path"`
1.7918 - HOTSPOT_LD="$windows_path"
1.7919 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.7920 - windows_path=`cmd //c echo $unix_path`
1.7921 - HOTSPOT_LD="$windows_path"
1.7922 - fi
1.7923 -
1.7924 -
1.7925 - unix_path="$HOTSPOT_MT"
1.7926 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.7927 - windows_path=`$CYGPATH -m "$unix_path"`
1.7928 - HOTSPOT_MT="$windows_path"
1.7929 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.7930 - windows_path=`cmd //c echo $unix_path`
1.7931 - HOTSPOT_MT="$windows_path"
1.7932 - fi
1.7933 -
1.7934 -
1.7935 - unix_path="$HOTSPOT_RC"
1.7936 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.7937 - windows_path=`$CYGPATH -m "$unix_path"`
1.7938 - HOTSPOT_RC="$windows_path"
1.7939 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.7940 - windows_path=`cmd //c echo $unix_path`
1.7941 - HOTSPOT_RC="$windows_path"
1.7942 - fi
1.7943 -
1.7944 -
1.7945 -
1.7946 -
1.7947 - RC_FLAGS="-nologo -l 0x409 -r"
1.7948 - if test "x$VARIANT" = xOPT; then :
1.7949 -
1.7950 - RC_FLAGS="$RC_FLAGS -d NDEBUG"
1.7951 -
1.7952 -fi
1.7953 -
1.7954 - # The version variables used to create RC_FLAGS may be overridden
1.7955 - # in a custom configure script, or possibly the command line.
1.7956 - # Let those variables be expanded at make time in spec.gmk.
1.7957 - # The \$ are escaped to the shell, and the $(...) variables
1.7958 - # are evaluated by make.
1.7959 - RC_FLAGS="$RC_FLAGS \
1.7960 - -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \
1.7961 - -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
1.7962 - -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
1.7963 - -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \
1.7964 - -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
1.7965 - -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
1.7966 - -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_BUILD_NUMBER)\""
1.7967 -
1.7968 - # lib.exe is used to create static libraries.
1.7969 - # Extract the first word of "lib", so it can be a program name with args.
1.7970 -set dummy lib; ac_word=$2
1.7971 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.7972 -$as_echo_n "checking for $ac_word... " >&6; }
1.7973 -if ${ac_cv_prog_WINAR+:} false; then :
1.7974 - $as_echo_n "(cached) " >&6
1.7975 -else
1.7976 - if test -n "$WINAR"; then
1.7977 - ac_cv_prog_WINAR="$WINAR" # Let the user override the test.
1.7978 -else
1.7979 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.7980 -for as_dir in $PATH
1.7981 -do
1.7982 - IFS=$as_save_IFS
1.7983 - test -z "$as_dir" && as_dir=.
1.7984 - for ac_exec_ext in '' $ac_executable_extensions; do
1.7985 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.7986 - ac_cv_prog_WINAR="lib"
1.7987 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.7988 - break 2
1.7989 - fi
1.7990 -done
1.7991 - done
1.7992 -IFS=$as_save_IFS
1.7993 -
1.7994 -fi
1.7995 -fi
1.7996 -WINAR=$ac_cv_prog_WINAR
1.7997 -if test -n "$WINAR"; then
1.7998 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINAR" >&5
1.7999 -$as_echo "$WINAR" >&6; }
1.8000 -else
1.8001 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.8002 -$as_echo "no" >&6; }
1.8003 -fi
1.8004 -
1.8005 -
1.8006 -
1.8007 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.8008 -
1.8009 - # First separate the path from the arguments. This will split at the first
1.8010 - # space.
1.8011 - complete="$WINAR"
1.8012 + DUMPBIN="$new_complete"
1.8013 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DUMPBIN to \"$new_complete\"" >&5
1.8014 +$as_echo "$as_me: Rewriting DUMPBIN to \"$new_complete\"" >&6;}
1.8015 + fi
1.8016 +
1.8017 + fi
1.8018 +
1.8019 + if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.8020 +
1.8021 +
1.8022 + # Publish this variable in the help.
1.8023 +
1.8024 +
1.8025 + if test "x$STRIP" = x; then
1.8026 + # The variable is not set by user, try to locate tool using the code snippet
1.8027 + for ac_prog in strip
1.8028 +do
1.8029 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.8030 +set dummy $ac_prog; ac_word=$2
1.8031 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.8032 +$as_echo_n "checking for $ac_word... " >&6; }
1.8033 +if ${ac_cv_path_STRIP+:} false; then :
1.8034 + $as_echo_n "(cached) " >&6
1.8035 +else
1.8036 + case $STRIP in
1.8037 + [\\/]* | ?:[\\/]*)
1.8038 + ac_cv_path_STRIP="$STRIP" # Let the user override the test with a path.
1.8039 + ;;
1.8040 + *)
1.8041 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.8042 +for as_dir in $PATH
1.8043 +do
1.8044 + IFS=$as_save_IFS
1.8045 + test -z "$as_dir" && as_dir=.
1.8046 + for ac_exec_ext in '' $ac_executable_extensions; do
1.8047 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.8048 + ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext"
1.8049 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.8050 + break 2
1.8051 + fi
1.8052 +done
1.8053 + done
1.8054 +IFS=$as_save_IFS
1.8055 +
1.8056 + ;;
1.8057 +esac
1.8058 +fi
1.8059 +STRIP=$ac_cv_path_STRIP
1.8060 +if test -n "$STRIP"; then
1.8061 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
1.8062 +$as_echo "$STRIP" >&6; }
1.8063 +else
1.8064 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.8065 +$as_echo "no" >&6; }
1.8066 +fi
1.8067 +
1.8068 +
1.8069 + test -n "$STRIP" && break
1.8070 +done
1.8071 +
1.8072 + else
1.8073 + # The variable is set, but is it from the command line or the environment?
1.8074 +
1.8075 + # Try to remove the string !STRIP! from our list.
1.8076 + try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!STRIP!/}
1.8077 + if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.8078 + # If it failed, the variable was not from the command line. Ignore it,
1.8079 + # but warn the user (except for BASH, which is always set by the calling BASH).
1.8080 + if test "xSTRIP" != xBASH; then
1.8081 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of STRIP from the environment. Use command line variables instead." >&5
1.8082 +$as_echo "$as_me: WARNING: Ignoring value of STRIP from the environment. Use command line variables instead." >&2;}
1.8083 + fi
1.8084 + # Try to locate tool using the code snippet
1.8085 + for ac_prog in strip
1.8086 +do
1.8087 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.8088 +set dummy $ac_prog; ac_word=$2
1.8089 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.8090 +$as_echo_n "checking for $ac_word... " >&6; }
1.8091 +if ${ac_cv_path_STRIP+:} false; then :
1.8092 + $as_echo_n "(cached) " >&6
1.8093 +else
1.8094 + case $STRIP in
1.8095 + [\\/]* | ?:[\\/]*)
1.8096 + ac_cv_path_STRIP="$STRIP" # Let the user override the test with a path.
1.8097 + ;;
1.8098 + *)
1.8099 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.8100 +for as_dir in $PATH
1.8101 +do
1.8102 + IFS=$as_save_IFS
1.8103 + test -z "$as_dir" && as_dir=.
1.8104 + for ac_exec_ext in '' $ac_executable_extensions; do
1.8105 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.8106 + ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext"
1.8107 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.8108 + break 2
1.8109 + fi
1.8110 +done
1.8111 + done
1.8112 +IFS=$as_save_IFS
1.8113 +
1.8114 + ;;
1.8115 +esac
1.8116 +fi
1.8117 +STRIP=$ac_cv_path_STRIP
1.8118 +if test -n "$STRIP"; then
1.8119 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
1.8120 +$as_echo "$STRIP" >&6; }
1.8121 +else
1.8122 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.8123 +$as_echo "no" >&6; }
1.8124 +fi
1.8125 +
1.8126 +
1.8127 + test -n "$STRIP" && break
1.8128 +done
1.8129 +
1.8130 + else
1.8131 + # If it succeeded, then it was overridden by the user. We will use it
1.8132 + # for the tool.
1.8133 +
1.8134 + # First remove it from the list of overridden variables, so we can test
1.8135 + # for unknown variables in the end.
1.8136 + CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.8137 +
1.8138 + # Check if the provided tool contains a complete path.
1.8139 + tool_specified="$STRIP"
1.8140 + tool_basename="${tool_specified##*/}"
1.8141 + if test "x$tool_basename" = "x$tool_specified"; then
1.8142 + # A command without a complete path is provided, search $PATH.
1.8143 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool STRIP=$tool_basename" >&5
1.8144 +$as_echo "$as_me: Will search for user supplied tool STRIP=$tool_basename" >&6;}
1.8145 + # Extract the first word of "$tool_basename", so it can be a program name with args.
1.8146 +set dummy $tool_basename; ac_word=$2
1.8147 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.8148 +$as_echo_n "checking for $ac_word... " >&6; }
1.8149 +if ${ac_cv_path_STRIP+:} false; then :
1.8150 + $as_echo_n "(cached) " >&6
1.8151 +else
1.8152 + case $STRIP in
1.8153 + [\\/]* | ?:[\\/]*)
1.8154 + ac_cv_path_STRIP="$STRIP" # Let the user override the test with a path.
1.8155 + ;;
1.8156 + *)
1.8157 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.8158 +for as_dir in $PATH
1.8159 +do
1.8160 + IFS=$as_save_IFS
1.8161 + test -z "$as_dir" && as_dir=.
1.8162 + for ac_exec_ext in '' $ac_executable_extensions; do
1.8163 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.8164 + ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext"
1.8165 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.8166 + break 2
1.8167 + fi
1.8168 +done
1.8169 + done
1.8170 +IFS=$as_save_IFS
1.8171 +
1.8172 + ;;
1.8173 +esac
1.8174 +fi
1.8175 +STRIP=$ac_cv_path_STRIP
1.8176 +if test -n "$STRIP"; then
1.8177 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
1.8178 +$as_echo "$STRIP" >&6; }
1.8179 +else
1.8180 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.8181 +$as_echo "no" >&6; }
1.8182 +fi
1.8183 +
1.8184 +
1.8185 + if test "x$STRIP" = x; then
1.8186 + as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.8187 + fi
1.8188 + else
1.8189 + # Otherwise we believe it is a complete path. Use it as it is.
1.8190 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool STRIP=$tool_specified" >&5
1.8191 +$as_echo "$as_me: Will use user supplied tool STRIP=$tool_specified" >&6;}
1.8192 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for STRIP" >&5
1.8193 +$as_echo_n "checking for STRIP... " >&6; }
1.8194 + if test ! -x "$tool_specified"; then
1.8195 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.8196 +$as_echo "not found" >&6; }
1.8197 + as_fn_error $? "User supplied tool STRIP=$tool_specified does not exist or is not executable" "$LINENO" 5
1.8198 + fi
1.8199 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.8200 +$as_echo "$tool_specified" >&6; }
1.8201 + fi
1.8202 + fi
1.8203 + fi
1.8204 +
1.8205 +
1.8206 +
1.8207 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.8208 +
1.8209 + # First separate the path from the arguments. This will split at the first
1.8210 + # space.
1.8211 + complete="$STRIP"
1.8212 path="${complete%% *}"
1.8213 tmp="$complete EOL"
1.8214 arguments="${tmp#* }"
1.8215 @@ -33124,14 +33512,14 @@
1.8216 fi
1.8217 if test "x$new_path" = x; then
1.8218 # It's still not found. Now this is an unrecoverable error.
1.8219 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINAR, which resolves as \"$complete\", is not found." >&5
1.8220 -$as_echo "$as_me: The path of WINAR, which resolves as \"$complete\", is not found." >&6;}
1.8221 - has_space=`$ECHO "$complete" | $GREP " "`
1.8222 - if test "x$has_space" != x; then
1.8223 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.8224 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.8225 - fi
1.8226 - as_fn_error $? "Cannot locate the the path of WINAR" "$LINENO" 5
1.8227 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
1.8228 +$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
1.8229 + has_space=`$ECHO "$complete" | $GREP " "`
1.8230 + if test "x$has_space" != x; then
1.8231 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.8232 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.8233 + fi
1.8234 + as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.8235 fi
1.8236 fi
1.8237
1.8238 @@ -33151,11 +33539,11 @@
1.8239 elif test -f "${new_path}.cmd"; then
1.8240 input_to_shortpath="${new_path}.cmd"
1.8241 else
1.8242 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINAR, which resolves as \"$new_path\", is invalid." >&5
1.8243 -$as_echo "$as_me: The path of WINAR, which resolves as \"$new_path\", is invalid." >&6;}
1.8244 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$new_path\", is invalid." >&5
1.8245 +$as_echo "$as_me: The path of STRIP, which resolves as \"$new_path\", is invalid." >&6;}
1.8246 { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.8247 $as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.8248 - as_fn_error $? "Cannot locate the the path of WINAR" "$LINENO" 5
1.8249 + as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.8250 fi
1.8251 else
1.8252 input_to_shortpath="$new_path"
1.8253 @@ -33202,7 +33590,7 @@
1.8254
1.8255 # First separate the path from the arguments. This will split at the first
1.8256 # space.
1.8257 - complete="$WINAR"
1.8258 + complete="$STRIP"
1.8259 path="${complete%% *}"
1.8260 tmp="$complete EOL"
1.8261 arguments="${tmp#* }"
1.8262 @@ -33247,14 +33635,14 @@
1.8263
1.8264 if test "x$new_path" = x; then
1.8265 # It's still not found. Now this is an unrecoverable error.
1.8266 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINAR, which resolves as \"$complete\", is not found." >&5
1.8267 -$as_echo "$as_me: The path of WINAR, which resolves as \"$complete\", is not found." >&6;}
1.8268 - has_space=`$ECHO "$complete" | $GREP " "`
1.8269 - if test "x$has_space" != x; then
1.8270 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.8271 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.8272 - fi
1.8273 - as_fn_error $? "Cannot locate the the path of WINAR" "$LINENO" 5
1.8274 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
1.8275 +$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
1.8276 + has_space=`$ECHO "$complete" | $GREP " "`
1.8277 + if test "x$has_space" != x; then
1.8278 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.8279 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.8280 + fi
1.8281 + as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.8282 fi
1.8283 fi
1.8284
1.8285 @@ -33300,7 +33688,7 @@
1.8286 # We're on a posix platform. Hooray! :)
1.8287 # First separate the path from the arguments. This will split at the first
1.8288 # space.
1.8289 - complete="$WINAR"
1.8290 + complete="$STRIP"
1.8291 path="${complete%% *}"
1.8292 tmp="$complete EOL"
1.8293 arguments="${tmp#* }"
1.8294 @@ -33319,20 +33707,19 @@
1.8295 done
1.8296 IFS="$IFS_save"
1.8297 else
1.8298 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving WINAR (as $path) failed, using $path directly." >&5
1.8299 -$as_echo "$as_me: Resolving WINAR (as $path) failed, using $path directly." >&6;}
1.8300 + # This is an absolute path, we can use it without further modifications.
1.8301 new_path="$path"
1.8302 fi
1.8303
1.8304 if test "x$new_path" = x; then
1.8305 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINAR, which resolves as \"$complete\", is not found." >&5
1.8306 -$as_echo "$as_me: The path of WINAR, which resolves as \"$complete\", is not found." >&6;}
1.8307 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
1.8308 +$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
1.8309 has_space=`$ECHO "$complete" | $GREP " "`
1.8310 if test "x$has_space" != x; then
1.8311 { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8312 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.8313 fi
1.8314 - as_fn_error $? "Cannot locate the the path of WINAR" "$LINENO" 5
1.8315 + as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.8316 fi
1.8317 fi
1.8318
1.8319 @@ -33344,57 +33731,203 @@
1.8320 fi
1.8321
1.8322 if test "x$complete" != "x$new_complete"; then
1.8323 - WINAR="$new_complete"
1.8324 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting WINAR to \"$new_complete\"" >&5
1.8325 -$as_echo "$as_me: Rewriting WINAR to \"$new_complete\"" >&6;}
1.8326 - fi
1.8327 -
1.8328 - AR="$WINAR"
1.8329 - ARFLAGS="-nologo -NODEFAULTLIB:MSVCRT"
1.8330 -
1.8331 - # Extract the first word of "dumpbin", so it can be a program name with args.
1.8332 -set dummy dumpbin; ac_word=$2
1.8333 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.8334 -$as_echo_n "checking for $ac_word... " >&6; }
1.8335 -if ${ac_cv_prog_DUMPBIN+:} false; then :
1.8336 - $as_echo_n "(cached) " >&6
1.8337 -else
1.8338 - if test -n "$DUMPBIN"; then
1.8339 - ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
1.8340 -else
1.8341 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.8342 -for as_dir in $PATH
1.8343 -do
1.8344 - IFS=$as_save_IFS
1.8345 - test -z "$as_dir" && as_dir=.
1.8346 - for ac_exec_ext in '' $ac_executable_extensions; do
1.8347 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.8348 - ac_cv_prog_DUMPBIN="dumpbin"
1.8349 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.8350 - break 2
1.8351 - fi
1.8352 -done
1.8353 - done
1.8354 -IFS=$as_save_IFS
1.8355 -
1.8356 -fi
1.8357 -fi
1.8358 -DUMPBIN=$ac_cv_prog_DUMPBIN
1.8359 -if test -n "$DUMPBIN"; then
1.8360 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
1.8361 -$as_echo "$DUMPBIN" >&6; }
1.8362 -else
1.8363 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.8364 -$as_echo "no" >&6; }
1.8365 -fi
1.8366 -
1.8367 -
1.8368 -
1.8369 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.8370 -
1.8371 - # First separate the path from the arguments. This will split at the first
1.8372 - # space.
1.8373 - complete="$DUMPBIN"
1.8374 + STRIP="$new_complete"
1.8375 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5
1.8376 +$as_echo "$as_me: Rewriting STRIP to \"$new_complete\"" >&6;}
1.8377 + fi
1.8378 +
1.8379 +
1.8380 +
1.8381 + # Publish this variable in the help.
1.8382 +
1.8383 +
1.8384 + if test "x$NM" = x; then
1.8385 + # The variable is not set by user, try to locate tool using the code snippet
1.8386 + for ac_prog in nm
1.8387 +do
1.8388 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.8389 +set dummy $ac_prog; ac_word=$2
1.8390 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.8391 +$as_echo_n "checking for $ac_word... " >&6; }
1.8392 +if ${ac_cv_path_NM+:} false; then :
1.8393 + $as_echo_n "(cached) " >&6
1.8394 +else
1.8395 + case $NM in
1.8396 + [\\/]* | ?:[\\/]*)
1.8397 + ac_cv_path_NM="$NM" # Let the user override the test with a path.
1.8398 + ;;
1.8399 + *)
1.8400 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.8401 +for as_dir in $PATH
1.8402 +do
1.8403 + IFS=$as_save_IFS
1.8404 + test -z "$as_dir" && as_dir=.
1.8405 + for ac_exec_ext in '' $ac_executable_extensions; do
1.8406 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.8407 + ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext"
1.8408 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.8409 + break 2
1.8410 + fi
1.8411 +done
1.8412 + done
1.8413 +IFS=$as_save_IFS
1.8414 +
1.8415 + ;;
1.8416 +esac
1.8417 +fi
1.8418 +NM=$ac_cv_path_NM
1.8419 +if test -n "$NM"; then
1.8420 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
1.8421 +$as_echo "$NM" >&6; }
1.8422 +else
1.8423 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.8424 +$as_echo "no" >&6; }
1.8425 +fi
1.8426 +
1.8427 +
1.8428 + test -n "$NM" && break
1.8429 +done
1.8430 +
1.8431 + else
1.8432 + # The variable is set, but is it from the command line or the environment?
1.8433 +
1.8434 + # Try to remove the string !NM! from our list.
1.8435 + try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!NM!/}
1.8436 + if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.8437 + # If it failed, the variable was not from the command line. Ignore it,
1.8438 + # but warn the user (except for BASH, which is always set by the calling BASH).
1.8439 + if test "xNM" != xBASH; then
1.8440 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of NM from the environment. Use command line variables instead." >&5
1.8441 +$as_echo "$as_me: WARNING: Ignoring value of NM from the environment. Use command line variables instead." >&2;}
1.8442 + fi
1.8443 + # Try to locate tool using the code snippet
1.8444 + for ac_prog in nm
1.8445 +do
1.8446 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.8447 +set dummy $ac_prog; ac_word=$2
1.8448 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.8449 +$as_echo_n "checking for $ac_word... " >&6; }
1.8450 +if ${ac_cv_path_NM+:} false; then :
1.8451 + $as_echo_n "(cached) " >&6
1.8452 +else
1.8453 + case $NM in
1.8454 + [\\/]* | ?:[\\/]*)
1.8455 + ac_cv_path_NM="$NM" # Let the user override the test with a path.
1.8456 + ;;
1.8457 + *)
1.8458 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.8459 +for as_dir in $PATH
1.8460 +do
1.8461 + IFS=$as_save_IFS
1.8462 + test -z "$as_dir" && as_dir=.
1.8463 + for ac_exec_ext in '' $ac_executable_extensions; do
1.8464 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.8465 + ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext"
1.8466 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.8467 + break 2
1.8468 + fi
1.8469 +done
1.8470 + done
1.8471 +IFS=$as_save_IFS
1.8472 +
1.8473 + ;;
1.8474 +esac
1.8475 +fi
1.8476 +NM=$ac_cv_path_NM
1.8477 +if test -n "$NM"; then
1.8478 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
1.8479 +$as_echo "$NM" >&6; }
1.8480 +else
1.8481 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.8482 +$as_echo "no" >&6; }
1.8483 +fi
1.8484 +
1.8485 +
1.8486 + test -n "$NM" && break
1.8487 +done
1.8488 +
1.8489 + else
1.8490 + # If it succeeded, then it was overridden by the user. We will use it
1.8491 + # for the tool.
1.8492 +
1.8493 + # First remove it from the list of overridden variables, so we can test
1.8494 + # for unknown variables in the end.
1.8495 + CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.8496 +
1.8497 + # Check if the provided tool contains a complete path.
1.8498 + tool_specified="$NM"
1.8499 + tool_basename="${tool_specified##*/}"
1.8500 + if test "x$tool_basename" = "x$tool_specified"; then
1.8501 + # A command without a complete path is provided, search $PATH.
1.8502 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool NM=$tool_basename" >&5
1.8503 +$as_echo "$as_me: Will search for user supplied tool NM=$tool_basename" >&6;}
1.8504 + # Extract the first word of "$tool_basename", so it can be a program name with args.
1.8505 +set dummy $tool_basename; ac_word=$2
1.8506 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.8507 +$as_echo_n "checking for $ac_word... " >&6; }
1.8508 +if ${ac_cv_path_NM+:} false; then :
1.8509 + $as_echo_n "(cached) " >&6
1.8510 +else
1.8511 + case $NM in
1.8512 + [\\/]* | ?:[\\/]*)
1.8513 + ac_cv_path_NM="$NM" # Let the user override the test with a path.
1.8514 + ;;
1.8515 + *)
1.8516 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.8517 +for as_dir in $PATH
1.8518 +do
1.8519 + IFS=$as_save_IFS
1.8520 + test -z "$as_dir" && as_dir=.
1.8521 + for ac_exec_ext in '' $ac_executable_extensions; do
1.8522 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.8523 + ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext"
1.8524 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.8525 + break 2
1.8526 + fi
1.8527 +done
1.8528 + done
1.8529 +IFS=$as_save_IFS
1.8530 +
1.8531 + ;;
1.8532 +esac
1.8533 +fi
1.8534 +NM=$ac_cv_path_NM
1.8535 +if test -n "$NM"; then
1.8536 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
1.8537 +$as_echo "$NM" >&6; }
1.8538 +else
1.8539 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.8540 +$as_echo "no" >&6; }
1.8541 +fi
1.8542 +
1.8543 +
1.8544 + if test "x$NM" = x; then
1.8545 + as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.8546 + fi
1.8547 + else
1.8548 + # Otherwise we believe it is a complete path. Use it as it is.
1.8549 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool NM=$tool_specified" >&5
1.8550 +$as_echo "$as_me: Will use user supplied tool NM=$tool_specified" >&6;}
1.8551 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NM" >&5
1.8552 +$as_echo_n "checking for NM... " >&6; }
1.8553 + if test ! -x "$tool_specified"; then
1.8554 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.8555 +$as_echo "not found" >&6; }
1.8556 + as_fn_error $? "User supplied tool NM=$tool_specified does not exist or is not executable" "$LINENO" 5
1.8557 + fi
1.8558 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.8559 +$as_echo "$tool_specified" >&6; }
1.8560 + fi
1.8561 + fi
1.8562 + fi
1.8563 +
1.8564 +
1.8565 +
1.8566 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.8567 +
1.8568 + # First separate the path from the arguments. This will split at the first
1.8569 + # space.
1.8570 + complete="$NM"
1.8571 path="${complete%% *}"
1.8572 tmp="$complete EOL"
1.8573 arguments="${tmp#* }"
1.8574 @@ -33430,14 +33963,14 @@
1.8575 fi
1.8576 if test "x$new_path" = x; then
1.8577 # It's still not found. Now this is an unrecoverable error.
1.8578 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&5
1.8579 -$as_echo "$as_me: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&6;}
1.8580 - has_space=`$ECHO "$complete" | $GREP " "`
1.8581 - if test "x$has_space" != x; then
1.8582 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.8583 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.8584 - fi
1.8585 - as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5
1.8586 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
1.8587 +$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
1.8588 + has_space=`$ECHO "$complete" | $GREP " "`
1.8589 + if test "x$has_space" != x; then
1.8590 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.8591 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.8592 + fi
1.8593 + as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
1.8594 fi
1.8595 fi
1.8596
1.8597 @@ -33457,11 +33990,11 @@
1.8598 elif test -f "${new_path}.cmd"; then
1.8599 input_to_shortpath="${new_path}.cmd"
1.8600 else
1.8601 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$new_path\", is invalid." >&5
1.8602 -$as_echo "$as_me: The path of DUMPBIN, which resolves as \"$new_path\", is invalid." >&6;}
1.8603 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$new_path\", is invalid." >&5
1.8604 +$as_echo "$as_me: The path of NM, which resolves as \"$new_path\", is invalid." >&6;}
1.8605 { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.8606 $as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.8607 - as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5
1.8608 + as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
1.8609 fi
1.8610 else
1.8611 input_to_shortpath="$new_path"
1.8612 @@ -33508,7 +34041,7 @@
1.8613
1.8614 # First separate the path from the arguments. This will split at the first
1.8615 # space.
1.8616 - complete="$DUMPBIN"
1.8617 + complete="$NM"
1.8618 path="${complete%% *}"
1.8619 tmp="$complete EOL"
1.8620 arguments="${tmp#* }"
1.8621 @@ -33553,14 +34086,14 @@
1.8622
1.8623 if test "x$new_path" = x; then
1.8624 # It's still not found. Now this is an unrecoverable error.
1.8625 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&5
1.8626 -$as_echo "$as_me: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&6;}
1.8627 - has_space=`$ECHO "$complete" | $GREP " "`
1.8628 - if test "x$has_space" != x; then
1.8629 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.8630 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.8631 - fi
1.8632 - as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5
1.8633 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
1.8634 +$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
1.8635 + has_space=`$ECHO "$complete" | $GREP " "`
1.8636 + if test "x$has_space" != x; then
1.8637 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.8638 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.8639 + fi
1.8640 + as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
1.8641 fi
1.8642 fi
1.8643
1.8644 @@ -33606,7 +34139,7 @@
1.8645 # We're on a posix platform. Hooray! :)
1.8646 # First separate the path from the arguments. This will split at the first
1.8647 # space.
1.8648 - complete="$DUMPBIN"
1.8649 + complete="$NM"
1.8650 path="${complete%% *}"
1.8651 tmp="$complete EOL"
1.8652 arguments="${tmp#* }"
1.8653 @@ -33625,20 +34158,19 @@
1.8654 done
1.8655 IFS="$IFS_save"
1.8656 else
1.8657 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving DUMPBIN (as $path) failed, using $path directly." >&5
1.8658 -$as_echo "$as_me: Resolving DUMPBIN (as $path) failed, using $path directly." >&6;}
1.8659 + # This is an absolute path, we can use it without further modifications.
1.8660 new_path="$path"
1.8661 fi
1.8662
1.8663 if test "x$new_path" = x; then
1.8664 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&5
1.8665 -$as_echo "$as_me: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&6;}
1.8666 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
1.8667 +$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
1.8668 has_space=`$ECHO "$complete" | $GREP " "`
1.8669 if test "x$has_space" != x; then
1.8670 { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.8671 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.8672 fi
1.8673 - as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5
1.8674 + as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
1.8675 fi
1.8676 fi
1.8677
1.8678 @@ -33650,163 +34182,203 @@
1.8679 fi
1.8680
1.8681 if test "x$complete" != "x$new_complete"; then
1.8682 - DUMPBIN="$new_complete"
1.8683 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DUMPBIN to \"$new_complete\"" >&5
1.8684 -$as_echo "$as_me: Rewriting DUMPBIN to \"$new_complete\"" >&6;}
1.8685 - fi
1.8686 -
1.8687 -
1.8688 - COMPILER_TYPE=CL
1.8689 - # silence copyright notice and other headers.
1.8690 - COMMON_CCXXFLAGS="$COMMON_CCXXFLAGS -nologo"
1.8691 -
1.8692 -fi
1.8693 -
1.8694 -
1.8695 -
1.8696 - ac_ext=c
1.8697 -ac_cpp='$CPP $CPPFLAGS'
1.8698 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.8699 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.8700 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
1.8701 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
1.8702 -$as_echo_n "checking how to run the C preprocessor... " >&6; }
1.8703 -# On Suns, sometimes $CPP names a directory.
1.8704 -if test -n "$CPP" && test -d "$CPP"; then
1.8705 - CPP=
1.8706 -fi
1.8707 -if test -z "$CPP"; then
1.8708 - if ${ac_cv_prog_CPP+:} false; then :
1.8709 - $as_echo_n "(cached) " >&6
1.8710 -else
1.8711 - # Double quotes because CPP needs to be expanded
1.8712 - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
1.8713 - do
1.8714 - ac_preproc_ok=false
1.8715 -for ac_c_preproc_warn_flag in '' yes
1.8716 -do
1.8717 - # Use a header file that comes with gcc, so configuring glibc
1.8718 - # with a fresh cross-compiler works.
1.8719 - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.8720 - # <limits.h> exists even on freestanding compilers.
1.8721 - # On the NeXT, cc -E runs the code through the compiler's parser,
1.8722 - # not just through cpp. "Syntax error" is here to catch this case.
1.8723 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.8724 -/* end confdefs.h. */
1.8725 -#ifdef __STDC__
1.8726 -# include <limits.h>
1.8727 -#else
1.8728 -# include <assert.h>
1.8729 -#endif
1.8730 - Syntax error
1.8731 -_ACEOF
1.8732 -if ac_fn_c_try_cpp "$LINENO"; then :
1.8733 -
1.8734 -else
1.8735 - # Broken: fails on valid input.
1.8736 -continue
1.8737 -fi
1.8738 -rm -f conftest.err conftest.i conftest.$ac_ext
1.8739 -
1.8740 - # OK, works on sane cases. Now check whether nonexistent headers
1.8741 - # can be detected and how.
1.8742 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.8743 -/* end confdefs.h. */
1.8744 -#include <ac_nonexistent.h>
1.8745 -_ACEOF
1.8746 -if ac_fn_c_try_cpp "$LINENO"; then :
1.8747 - # Broken: success on invalid input.
1.8748 -continue
1.8749 -else
1.8750 - # Passes both tests.
1.8751 -ac_preproc_ok=:
1.8752 -break
1.8753 -fi
1.8754 -rm -f conftest.err conftest.i conftest.$ac_ext
1.8755 -
1.8756 -done
1.8757 -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
1.8758 -rm -f conftest.i conftest.err conftest.$ac_ext
1.8759 -if $ac_preproc_ok; then :
1.8760 - break
1.8761 -fi
1.8762 -
1.8763 - done
1.8764 - ac_cv_prog_CPP=$CPP
1.8765 -
1.8766 -fi
1.8767 - CPP=$ac_cv_prog_CPP
1.8768 -else
1.8769 - ac_cv_prog_CPP=$CPP
1.8770 -fi
1.8771 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
1.8772 -$as_echo "$CPP" >&6; }
1.8773 -ac_preproc_ok=false
1.8774 -for ac_c_preproc_warn_flag in '' yes
1.8775 -do
1.8776 - # Use a header file that comes with gcc, so configuring glibc
1.8777 - # with a fresh cross-compiler works.
1.8778 - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.8779 - # <limits.h> exists even on freestanding compilers.
1.8780 - # On the NeXT, cc -E runs the code through the compiler's parser,
1.8781 - # not just through cpp. "Syntax error" is here to catch this case.
1.8782 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.8783 -/* end confdefs.h. */
1.8784 -#ifdef __STDC__
1.8785 -# include <limits.h>
1.8786 -#else
1.8787 -# include <assert.h>
1.8788 -#endif
1.8789 - Syntax error
1.8790 -_ACEOF
1.8791 -if ac_fn_c_try_cpp "$LINENO"; then :
1.8792 -
1.8793 -else
1.8794 - # Broken: fails on valid input.
1.8795 -continue
1.8796 -fi
1.8797 -rm -f conftest.err conftest.i conftest.$ac_ext
1.8798 -
1.8799 - # OK, works on sane cases. Now check whether nonexistent headers
1.8800 - # can be detected and how.
1.8801 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.8802 -/* end confdefs.h. */
1.8803 -#include <ac_nonexistent.h>
1.8804 -_ACEOF
1.8805 -if ac_fn_c_try_cpp "$LINENO"; then :
1.8806 - # Broken: success on invalid input.
1.8807 -continue
1.8808 -else
1.8809 - # Passes both tests.
1.8810 -ac_preproc_ok=:
1.8811 -break
1.8812 -fi
1.8813 -rm -f conftest.err conftest.i conftest.$ac_ext
1.8814 -
1.8815 -done
1.8816 -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
1.8817 -rm -f conftest.i conftest.err conftest.$ac_ext
1.8818 -if $ac_preproc_ok; then :
1.8819 -
1.8820 -else
1.8821 - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.8822 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.8823 -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
1.8824 -See \`config.log' for more details" "$LINENO" 5; }
1.8825 -fi
1.8826 -
1.8827 -ac_ext=cpp
1.8828 -ac_cpp='$CXXCPP $CPPFLAGS'
1.8829 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.8830 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.8831 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1.8832 -
1.8833 -
1.8834 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.8835 -
1.8836 - # First separate the path from the arguments. This will split at the first
1.8837 - # space.
1.8838 - complete="$CPP"
1.8839 + NM="$new_complete"
1.8840 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting NM to \"$new_complete\"" >&5
1.8841 +$as_echo "$as_me: Rewriting NM to \"$new_complete\"" >&6;}
1.8842 + fi
1.8843 +
1.8844 +
1.8845 +
1.8846 + # Publish this variable in the help.
1.8847 +
1.8848 +
1.8849 + if test "x$GNM" = x; then
1.8850 + # The variable is not set by user, try to locate tool using the code snippet
1.8851 + for ac_prog in gnm
1.8852 +do
1.8853 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.8854 +set dummy $ac_prog; ac_word=$2
1.8855 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.8856 +$as_echo_n "checking for $ac_word... " >&6; }
1.8857 +if ${ac_cv_path_GNM+:} false; then :
1.8858 + $as_echo_n "(cached) " >&6
1.8859 +else
1.8860 + case $GNM in
1.8861 + [\\/]* | ?:[\\/]*)
1.8862 + ac_cv_path_GNM="$GNM" # Let the user override the test with a path.
1.8863 + ;;
1.8864 + *)
1.8865 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.8866 +for as_dir in $PATH
1.8867 +do
1.8868 + IFS=$as_save_IFS
1.8869 + test -z "$as_dir" && as_dir=.
1.8870 + for ac_exec_ext in '' $ac_executable_extensions; do
1.8871 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.8872 + ac_cv_path_GNM="$as_dir/$ac_word$ac_exec_ext"
1.8873 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.8874 + break 2
1.8875 + fi
1.8876 +done
1.8877 + done
1.8878 +IFS=$as_save_IFS
1.8879 +
1.8880 + ;;
1.8881 +esac
1.8882 +fi
1.8883 +GNM=$ac_cv_path_GNM
1.8884 +if test -n "$GNM"; then
1.8885 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNM" >&5
1.8886 +$as_echo "$GNM" >&6; }
1.8887 +else
1.8888 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.8889 +$as_echo "no" >&6; }
1.8890 +fi
1.8891 +
1.8892 +
1.8893 + test -n "$GNM" && break
1.8894 +done
1.8895 +
1.8896 + else
1.8897 + # The variable is set, but is it from the command line or the environment?
1.8898 +
1.8899 + # Try to remove the string !GNM! from our list.
1.8900 + try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!GNM!/}
1.8901 + if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.8902 + # If it failed, the variable was not from the command line. Ignore it,
1.8903 + # but warn the user (except for BASH, which is always set by the calling BASH).
1.8904 + if test "xGNM" != xBASH; then
1.8905 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of GNM from the environment. Use command line variables instead." >&5
1.8906 +$as_echo "$as_me: WARNING: Ignoring value of GNM from the environment. Use command line variables instead." >&2;}
1.8907 + fi
1.8908 + # Try to locate tool using the code snippet
1.8909 + for ac_prog in gnm
1.8910 +do
1.8911 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.8912 +set dummy $ac_prog; ac_word=$2
1.8913 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.8914 +$as_echo_n "checking for $ac_word... " >&6; }
1.8915 +if ${ac_cv_path_GNM+:} false; then :
1.8916 + $as_echo_n "(cached) " >&6
1.8917 +else
1.8918 + case $GNM in
1.8919 + [\\/]* | ?:[\\/]*)
1.8920 + ac_cv_path_GNM="$GNM" # Let the user override the test with a path.
1.8921 + ;;
1.8922 + *)
1.8923 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.8924 +for as_dir in $PATH
1.8925 +do
1.8926 + IFS=$as_save_IFS
1.8927 + test -z "$as_dir" && as_dir=.
1.8928 + for ac_exec_ext in '' $ac_executable_extensions; do
1.8929 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.8930 + ac_cv_path_GNM="$as_dir/$ac_word$ac_exec_ext"
1.8931 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.8932 + break 2
1.8933 + fi
1.8934 +done
1.8935 + done
1.8936 +IFS=$as_save_IFS
1.8937 +
1.8938 + ;;
1.8939 +esac
1.8940 +fi
1.8941 +GNM=$ac_cv_path_GNM
1.8942 +if test -n "$GNM"; then
1.8943 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNM" >&5
1.8944 +$as_echo "$GNM" >&6; }
1.8945 +else
1.8946 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.8947 +$as_echo "no" >&6; }
1.8948 +fi
1.8949 +
1.8950 +
1.8951 + test -n "$GNM" && break
1.8952 +done
1.8953 +
1.8954 + else
1.8955 + # If it succeeded, then it was overridden by the user. We will use it
1.8956 + # for the tool.
1.8957 +
1.8958 + # First remove it from the list of overridden variables, so we can test
1.8959 + # for unknown variables in the end.
1.8960 + CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.8961 +
1.8962 + # Check if the provided tool contains a complete path.
1.8963 + tool_specified="$GNM"
1.8964 + tool_basename="${tool_specified##*/}"
1.8965 + if test "x$tool_basename" = "x$tool_specified"; then
1.8966 + # A command without a complete path is provided, search $PATH.
1.8967 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool GNM=$tool_basename" >&5
1.8968 +$as_echo "$as_me: Will search for user supplied tool GNM=$tool_basename" >&6;}
1.8969 + # Extract the first word of "$tool_basename", so it can be a program name with args.
1.8970 +set dummy $tool_basename; ac_word=$2
1.8971 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.8972 +$as_echo_n "checking for $ac_word... " >&6; }
1.8973 +if ${ac_cv_path_GNM+:} false; then :
1.8974 + $as_echo_n "(cached) " >&6
1.8975 +else
1.8976 + case $GNM in
1.8977 + [\\/]* | ?:[\\/]*)
1.8978 + ac_cv_path_GNM="$GNM" # Let the user override the test with a path.
1.8979 + ;;
1.8980 + *)
1.8981 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.8982 +for as_dir in $PATH
1.8983 +do
1.8984 + IFS=$as_save_IFS
1.8985 + test -z "$as_dir" && as_dir=.
1.8986 + for ac_exec_ext in '' $ac_executable_extensions; do
1.8987 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.8988 + ac_cv_path_GNM="$as_dir/$ac_word$ac_exec_ext"
1.8989 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.8990 + break 2
1.8991 + fi
1.8992 +done
1.8993 + done
1.8994 +IFS=$as_save_IFS
1.8995 +
1.8996 + ;;
1.8997 +esac
1.8998 +fi
1.8999 +GNM=$ac_cv_path_GNM
1.9000 +if test -n "$GNM"; then
1.9001 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNM" >&5
1.9002 +$as_echo "$GNM" >&6; }
1.9003 +else
1.9004 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.9005 +$as_echo "no" >&6; }
1.9006 +fi
1.9007 +
1.9008 +
1.9009 + if test "x$GNM" = x; then
1.9010 + as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.9011 + fi
1.9012 + else
1.9013 + # Otherwise we believe it is a complete path. Use it as it is.
1.9014 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool GNM=$tool_specified" >&5
1.9015 +$as_echo "$as_me: Will use user supplied tool GNM=$tool_specified" >&6;}
1.9016 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNM" >&5
1.9017 +$as_echo_n "checking for GNM... " >&6; }
1.9018 + if test ! -x "$tool_specified"; then
1.9019 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.9020 +$as_echo "not found" >&6; }
1.9021 + as_fn_error $? "User supplied tool GNM=$tool_specified does not exist or is not executable" "$LINENO" 5
1.9022 + fi
1.9023 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.9024 +$as_echo "$tool_specified" >&6; }
1.9025 + fi
1.9026 + fi
1.9027 + fi
1.9028 +
1.9029 +
1.9030 +
1.9031 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.9032 +
1.9033 + # First separate the path from the arguments. This will split at the first
1.9034 + # space.
1.9035 + complete="$GNM"
1.9036 path="${complete%% *}"
1.9037 tmp="$complete EOL"
1.9038 arguments="${tmp#* }"
1.9039 @@ -33842,14 +34414,14 @@
1.9040 fi
1.9041 if test "x$new_path" = x; then
1.9042 # It's still not found. Now this is an unrecoverable error.
1.9043 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$complete\", is not found." >&5
1.9044 -$as_echo "$as_me: The path of CPP, which resolves as \"$complete\", is not found." >&6;}
1.9045 - has_space=`$ECHO "$complete" | $GREP " "`
1.9046 - if test "x$has_space" != x; then
1.9047 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.9048 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.9049 - fi
1.9050 - as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5
1.9051 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of GNM, which resolves as \"$complete\", is not found." >&5
1.9052 +$as_echo "$as_me: The path of GNM, which resolves as \"$complete\", is not found." >&6;}
1.9053 + has_space=`$ECHO "$complete" | $GREP " "`
1.9054 + if test "x$has_space" != x; then
1.9055 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.9056 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.9057 + fi
1.9058 + as_fn_error $? "Cannot locate the the path of GNM" "$LINENO" 5
1.9059 fi
1.9060 fi
1.9061
1.9062 @@ -33869,11 +34441,11 @@
1.9063 elif test -f "${new_path}.cmd"; then
1.9064 input_to_shortpath="${new_path}.cmd"
1.9065 else
1.9066 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$new_path\", is invalid." >&5
1.9067 -$as_echo "$as_me: The path of CPP, which resolves as \"$new_path\", is invalid." >&6;}
1.9068 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of GNM, which resolves as \"$new_path\", is invalid." >&5
1.9069 +$as_echo "$as_me: The path of GNM, which resolves as \"$new_path\", is invalid." >&6;}
1.9070 { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.9071 $as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.9072 - as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5
1.9073 + as_fn_error $? "Cannot locate the the path of GNM" "$LINENO" 5
1.9074 fi
1.9075 else
1.9076 input_to_shortpath="$new_path"
1.9077 @@ -33920,7 +34492,7 @@
1.9078
1.9079 # First separate the path from the arguments. This will split at the first
1.9080 # space.
1.9081 - complete="$CPP"
1.9082 + complete="$GNM"
1.9083 path="${complete%% *}"
1.9084 tmp="$complete EOL"
1.9085 arguments="${tmp#* }"
1.9086 @@ -33965,14 +34537,14 @@
1.9087
1.9088 if test "x$new_path" = x; then
1.9089 # It's still not found. Now this is an unrecoverable error.
1.9090 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$complete\", is not found." >&5
1.9091 -$as_echo "$as_me: The path of CPP, which resolves as \"$complete\", is not found." >&6;}
1.9092 - has_space=`$ECHO "$complete" | $GREP " "`
1.9093 - if test "x$has_space" != x; then
1.9094 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.9095 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.9096 - fi
1.9097 - as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5
1.9098 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of GNM, which resolves as \"$complete\", is not found." >&5
1.9099 +$as_echo "$as_me: The path of GNM, which resolves as \"$complete\", is not found." >&6;}
1.9100 + has_space=`$ECHO "$complete" | $GREP " "`
1.9101 + if test "x$has_space" != x; then
1.9102 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.9103 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.9104 + fi
1.9105 + as_fn_error $? "Cannot locate the the path of GNM" "$LINENO" 5
1.9106 fi
1.9107 fi
1.9108
1.9109 @@ -34018,7 +34590,7 @@
1.9110 # We're on a posix platform. Hooray! :)
1.9111 # First separate the path from the arguments. This will split at the first
1.9112 # space.
1.9113 - complete="$CPP"
1.9114 + complete="$GNM"
1.9115 path="${complete%% *}"
1.9116 tmp="$complete EOL"
1.9117 arguments="${tmp#* }"
1.9118 @@ -34037,20 +34609,19 @@
1.9119 done
1.9120 IFS="$IFS_save"
1.9121 else
1.9122 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CPP (as $path) failed, using $path directly." >&5
1.9123 -$as_echo "$as_me: Resolving CPP (as $path) failed, using $path directly." >&6;}
1.9124 + # This is an absolute path, we can use it without further modifications.
1.9125 new_path="$path"
1.9126 fi
1.9127
1.9128 if test "x$new_path" = x; then
1.9129 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$complete\", is not found." >&5
1.9130 -$as_echo "$as_me: The path of CPP, which resolves as \"$complete\", is not found." >&6;}
1.9131 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of GNM, which resolves as \"$complete\", is not found." >&5
1.9132 +$as_echo "$as_me: The path of GNM, which resolves as \"$complete\", is not found." >&6;}
1.9133 has_space=`$ECHO "$complete" | $GREP " "`
1.9134 if test "x$has_space" != x; then
1.9135 { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.9136 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.9137 fi
1.9138 - as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5
1.9139 + as_fn_error $? "Cannot locate the the path of GNM" "$LINENO" 5
1.9140 fi
1.9141 fi
1.9142
1.9143 @@ -34062,151 +34633,204 @@
1.9144 fi
1.9145
1.9146 if test "x$complete" != "x$new_complete"; then
1.9147 - CPP="$new_complete"
1.9148 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CPP to \"$new_complete\"" >&5
1.9149 -$as_echo "$as_me: Rewriting CPP to \"$new_complete\"" >&6;}
1.9150 - fi
1.9151 -
1.9152 -
1.9153 - ac_ext=cpp
1.9154 -ac_cpp='$CXXCPP $CPPFLAGS'
1.9155 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.9156 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.9157 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1.9158 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
1.9159 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
1.9160 -if test -z "$CXXCPP"; then
1.9161 - if ${ac_cv_prog_CXXCPP+:} false; then :
1.9162 - $as_echo_n "(cached) " >&6
1.9163 -else
1.9164 - # Double quotes because CXXCPP needs to be expanded
1.9165 - for CXXCPP in "$CXX -E" "/lib/cpp"
1.9166 - do
1.9167 - ac_preproc_ok=false
1.9168 -for ac_cxx_preproc_warn_flag in '' yes
1.9169 -do
1.9170 - # Use a header file that comes with gcc, so configuring glibc
1.9171 - # with a fresh cross-compiler works.
1.9172 - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.9173 - # <limits.h> exists even on freestanding compilers.
1.9174 - # On the NeXT, cc -E runs the code through the compiler's parser,
1.9175 - # not just through cpp. "Syntax error" is here to catch this case.
1.9176 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.9177 -/* end confdefs.h. */
1.9178 -#ifdef __STDC__
1.9179 -# include <limits.h>
1.9180 -#else
1.9181 -# include <assert.h>
1.9182 -#endif
1.9183 - Syntax error
1.9184 -_ACEOF
1.9185 -if ac_fn_cxx_try_cpp "$LINENO"; then :
1.9186 -
1.9187 -else
1.9188 - # Broken: fails on valid input.
1.9189 -continue
1.9190 -fi
1.9191 -rm -f conftest.err conftest.i conftest.$ac_ext
1.9192 -
1.9193 - # OK, works on sane cases. Now check whether nonexistent headers
1.9194 - # can be detected and how.
1.9195 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.9196 -/* end confdefs.h. */
1.9197 -#include <ac_nonexistent.h>
1.9198 -_ACEOF
1.9199 -if ac_fn_cxx_try_cpp "$LINENO"; then :
1.9200 - # Broken: success on invalid input.
1.9201 -continue
1.9202 -else
1.9203 - # Passes both tests.
1.9204 -ac_preproc_ok=:
1.9205 -break
1.9206 -fi
1.9207 -rm -f conftest.err conftest.i conftest.$ac_ext
1.9208 -
1.9209 -done
1.9210 -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
1.9211 -rm -f conftest.i conftest.err conftest.$ac_ext
1.9212 -if $ac_preproc_ok; then :
1.9213 - break
1.9214 -fi
1.9215 -
1.9216 - done
1.9217 - ac_cv_prog_CXXCPP=$CXXCPP
1.9218 -
1.9219 -fi
1.9220 - CXXCPP=$ac_cv_prog_CXXCPP
1.9221 -else
1.9222 - ac_cv_prog_CXXCPP=$CXXCPP
1.9223 -fi
1.9224 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
1.9225 -$as_echo "$CXXCPP" >&6; }
1.9226 -ac_preproc_ok=false
1.9227 -for ac_cxx_preproc_warn_flag in '' yes
1.9228 -do
1.9229 - # Use a header file that comes with gcc, so configuring glibc
1.9230 - # with a fresh cross-compiler works.
1.9231 - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1.9232 - # <limits.h> exists even on freestanding compilers.
1.9233 - # On the NeXT, cc -E runs the code through the compiler's parser,
1.9234 - # not just through cpp. "Syntax error" is here to catch this case.
1.9235 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.9236 -/* end confdefs.h. */
1.9237 -#ifdef __STDC__
1.9238 -# include <limits.h>
1.9239 -#else
1.9240 -# include <assert.h>
1.9241 -#endif
1.9242 - Syntax error
1.9243 -_ACEOF
1.9244 -if ac_fn_cxx_try_cpp "$LINENO"; then :
1.9245 -
1.9246 -else
1.9247 - # Broken: fails on valid input.
1.9248 -continue
1.9249 -fi
1.9250 -rm -f conftest.err conftest.i conftest.$ac_ext
1.9251 -
1.9252 - # OK, works on sane cases. Now check whether nonexistent headers
1.9253 - # can be detected and how.
1.9254 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.9255 -/* end confdefs.h. */
1.9256 -#include <ac_nonexistent.h>
1.9257 -_ACEOF
1.9258 -if ac_fn_cxx_try_cpp "$LINENO"; then :
1.9259 - # Broken: success on invalid input.
1.9260 -continue
1.9261 -else
1.9262 - # Passes both tests.
1.9263 -ac_preproc_ok=:
1.9264 -break
1.9265 -fi
1.9266 -rm -f conftest.err conftest.i conftest.$ac_ext
1.9267 -
1.9268 -done
1.9269 -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
1.9270 -rm -f conftest.i conftest.err conftest.$ac_ext
1.9271 -if $ac_preproc_ok; then :
1.9272 -
1.9273 -else
1.9274 - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.9275 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.9276 -as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
1.9277 -See \`config.log' for more details" "$LINENO" 5; }
1.9278 -fi
1.9279 -
1.9280 -ac_ext=cpp
1.9281 -ac_cpp='$CXXCPP $CPPFLAGS'
1.9282 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.9283 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1.9284 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1.9285 -
1.9286 -
1.9287 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.9288 -
1.9289 - # First separate the path from the arguments. This will split at the first
1.9290 - # space.
1.9291 - complete="$CXXCPP"
1.9292 + GNM="$new_complete"
1.9293 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting GNM to \"$new_complete\"" >&5
1.9294 +$as_echo "$as_me: Rewriting GNM to \"$new_complete\"" >&6;}
1.9295 + fi
1.9296 +
1.9297 +
1.9298 +
1.9299 +
1.9300 + # Publish this variable in the help.
1.9301 +
1.9302 +
1.9303 + if test "x$MCS" = x; then
1.9304 + # The variable is not set by user, try to locate tool using the code snippet
1.9305 + for ac_prog in mcs
1.9306 +do
1.9307 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.9308 +set dummy $ac_prog; ac_word=$2
1.9309 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.9310 +$as_echo_n "checking for $ac_word... " >&6; }
1.9311 +if ${ac_cv_path_MCS+:} false; then :
1.9312 + $as_echo_n "(cached) " >&6
1.9313 +else
1.9314 + case $MCS in
1.9315 + [\\/]* | ?:[\\/]*)
1.9316 + ac_cv_path_MCS="$MCS" # Let the user override the test with a path.
1.9317 + ;;
1.9318 + *)
1.9319 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.9320 +for as_dir in $PATH
1.9321 +do
1.9322 + IFS=$as_save_IFS
1.9323 + test -z "$as_dir" && as_dir=.
1.9324 + for ac_exec_ext in '' $ac_executable_extensions; do
1.9325 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.9326 + ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
1.9327 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.9328 + break 2
1.9329 + fi
1.9330 +done
1.9331 + done
1.9332 +IFS=$as_save_IFS
1.9333 +
1.9334 + ;;
1.9335 +esac
1.9336 +fi
1.9337 +MCS=$ac_cv_path_MCS
1.9338 +if test -n "$MCS"; then
1.9339 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5
1.9340 +$as_echo "$MCS" >&6; }
1.9341 +else
1.9342 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.9343 +$as_echo "no" >&6; }
1.9344 +fi
1.9345 +
1.9346 +
1.9347 + test -n "$MCS" && break
1.9348 +done
1.9349 +
1.9350 + else
1.9351 + # The variable is set, but is it from the command line or the environment?
1.9352 +
1.9353 + # Try to remove the string !MCS! from our list.
1.9354 + try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!MCS!/}
1.9355 + if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.9356 + # If it failed, the variable was not from the command line. Ignore it,
1.9357 + # but warn the user (except for BASH, which is always set by the calling BASH).
1.9358 + if test "xMCS" != xBASH; then
1.9359 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of MCS from the environment. Use command line variables instead." >&5
1.9360 +$as_echo "$as_me: WARNING: Ignoring value of MCS from the environment. Use command line variables instead." >&2;}
1.9361 + fi
1.9362 + # Try to locate tool using the code snippet
1.9363 + for ac_prog in mcs
1.9364 +do
1.9365 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.9366 +set dummy $ac_prog; ac_word=$2
1.9367 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.9368 +$as_echo_n "checking for $ac_word... " >&6; }
1.9369 +if ${ac_cv_path_MCS+:} false; then :
1.9370 + $as_echo_n "(cached) " >&6
1.9371 +else
1.9372 + case $MCS in
1.9373 + [\\/]* | ?:[\\/]*)
1.9374 + ac_cv_path_MCS="$MCS" # Let the user override the test with a path.
1.9375 + ;;
1.9376 + *)
1.9377 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.9378 +for as_dir in $PATH
1.9379 +do
1.9380 + IFS=$as_save_IFS
1.9381 + test -z "$as_dir" && as_dir=.
1.9382 + for ac_exec_ext in '' $ac_executable_extensions; do
1.9383 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.9384 + ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
1.9385 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.9386 + break 2
1.9387 + fi
1.9388 +done
1.9389 + done
1.9390 +IFS=$as_save_IFS
1.9391 +
1.9392 + ;;
1.9393 +esac
1.9394 +fi
1.9395 +MCS=$ac_cv_path_MCS
1.9396 +if test -n "$MCS"; then
1.9397 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5
1.9398 +$as_echo "$MCS" >&6; }
1.9399 +else
1.9400 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.9401 +$as_echo "no" >&6; }
1.9402 +fi
1.9403 +
1.9404 +
1.9405 + test -n "$MCS" && break
1.9406 +done
1.9407 +
1.9408 + else
1.9409 + # If it succeeded, then it was overridden by the user. We will use it
1.9410 + # for the tool.
1.9411 +
1.9412 + # First remove it from the list of overridden variables, so we can test
1.9413 + # for unknown variables in the end.
1.9414 + CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.9415 +
1.9416 + # Check if the provided tool contains a complete path.
1.9417 + tool_specified="$MCS"
1.9418 + tool_basename="${tool_specified##*/}"
1.9419 + if test "x$tool_basename" = "x$tool_specified"; then
1.9420 + # A command without a complete path is provided, search $PATH.
1.9421 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool MCS=$tool_basename" >&5
1.9422 +$as_echo "$as_me: Will search for user supplied tool MCS=$tool_basename" >&6;}
1.9423 + # Extract the first word of "$tool_basename", so it can be a program name with args.
1.9424 +set dummy $tool_basename; ac_word=$2
1.9425 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.9426 +$as_echo_n "checking for $ac_word... " >&6; }
1.9427 +if ${ac_cv_path_MCS+:} false; then :
1.9428 + $as_echo_n "(cached) " >&6
1.9429 +else
1.9430 + case $MCS in
1.9431 + [\\/]* | ?:[\\/]*)
1.9432 + ac_cv_path_MCS="$MCS" # Let the user override the test with a path.
1.9433 + ;;
1.9434 + *)
1.9435 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.9436 +for as_dir in $PATH
1.9437 +do
1.9438 + IFS=$as_save_IFS
1.9439 + test -z "$as_dir" && as_dir=.
1.9440 + for ac_exec_ext in '' $ac_executable_extensions; do
1.9441 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.9442 + ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
1.9443 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.9444 + break 2
1.9445 + fi
1.9446 +done
1.9447 + done
1.9448 +IFS=$as_save_IFS
1.9449 +
1.9450 + ;;
1.9451 +esac
1.9452 +fi
1.9453 +MCS=$ac_cv_path_MCS
1.9454 +if test -n "$MCS"; then
1.9455 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5
1.9456 +$as_echo "$MCS" >&6; }
1.9457 +else
1.9458 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.9459 +$as_echo "no" >&6; }
1.9460 +fi
1.9461 +
1.9462 +
1.9463 + if test "x$MCS" = x; then
1.9464 + as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.9465 + fi
1.9466 + else
1.9467 + # Otherwise we believe it is a complete path. Use it as it is.
1.9468 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool MCS=$tool_specified" >&5
1.9469 +$as_echo "$as_me: Will use user supplied tool MCS=$tool_specified" >&6;}
1.9470 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCS" >&5
1.9471 +$as_echo_n "checking for MCS... " >&6; }
1.9472 + if test ! -x "$tool_specified"; then
1.9473 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.9474 +$as_echo "not found" >&6; }
1.9475 + as_fn_error $? "User supplied tool MCS=$tool_specified does not exist or is not executable" "$LINENO" 5
1.9476 + fi
1.9477 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.9478 +$as_echo "$tool_specified" >&6; }
1.9479 + fi
1.9480 + fi
1.9481 + fi
1.9482 +
1.9483 +
1.9484 +
1.9485 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.9486 +
1.9487 + # First separate the path from the arguments. This will split at the first
1.9488 + # space.
1.9489 + complete="$MCS"
1.9490 path="${complete%% *}"
1.9491 tmp="$complete EOL"
1.9492 arguments="${tmp#* }"
1.9493 @@ -34242,14 +34866,14 @@
1.9494 fi
1.9495 if test "x$new_path" = x; then
1.9496 # It's still not found. Now this is an unrecoverable error.
1.9497 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$complete\", is not found." >&5
1.9498 -$as_echo "$as_me: The path of CXXCPP, which resolves as \"$complete\", is not found." >&6;}
1.9499 - has_space=`$ECHO "$complete" | $GREP " "`
1.9500 - if test "x$has_space" != x; then
1.9501 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.9502 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.9503 - fi
1.9504 - as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5
1.9505 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5
1.9506 +$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;}
1.9507 + has_space=`$ECHO "$complete" | $GREP " "`
1.9508 + if test "x$has_space" != x; then
1.9509 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.9510 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.9511 + fi
1.9512 + as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
1.9513 fi
1.9514 fi
1.9515
1.9516 @@ -34269,11 +34893,11 @@
1.9517 elif test -f "${new_path}.cmd"; then
1.9518 input_to_shortpath="${new_path}.cmd"
1.9519 else
1.9520 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$new_path\", is invalid." >&5
1.9521 -$as_echo "$as_me: The path of CXXCPP, which resolves as \"$new_path\", is invalid." >&6;}
1.9522 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$new_path\", is invalid." >&5
1.9523 +$as_echo "$as_me: The path of MCS, which resolves as \"$new_path\", is invalid." >&6;}
1.9524 { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.9525 $as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.9526 - as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5
1.9527 + as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
1.9528 fi
1.9529 else
1.9530 input_to_shortpath="$new_path"
1.9531 @@ -34320,7 +34944,7 @@
1.9532
1.9533 # First separate the path from the arguments. This will split at the first
1.9534 # space.
1.9535 - complete="$CXXCPP"
1.9536 + complete="$MCS"
1.9537 path="${complete%% *}"
1.9538 tmp="$complete EOL"
1.9539 arguments="${tmp#* }"
1.9540 @@ -34365,14 +34989,14 @@
1.9541
1.9542 if test "x$new_path" = x; then
1.9543 # It's still not found. Now this is an unrecoverable error.
1.9544 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$complete\", is not found." >&5
1.9545 -$as_echo "$as_me: The path of CXXCPP, which resolves as \"$complete\", is not found." >&6;}
1.9546 - has_space=`$ECHO "$complete" | $GREP " "`
1.9547 - if test "x$has_space" != x; then
1.9548 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.9549 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.9550 - fi
1.9551 - as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5
1.9552 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5
1.9553 +$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;}
1.9554 + has_space=`$ECHO "$complete" | $GREP " "`
1.9555 + if test "x$has_space" != x; then
1.9556 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.9557 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.9558 + fi
1.9559 + as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
1.9560 fi
1.9561 fi
1.9562
1.9563 @@ -34418,7 +35042,7 @@
1.9564 # We're on a posix platform. Hooray! :)
1.9565 # First separate the path from the arguments. This will split at the first
1.9566 # space.
1.9567 - complete="$CXXCPP"
1.9568 + complete="$MCS"
1.9569 path="${complete%% *}"
1.9570 tmp="$complete EOL"
1.9571 arguments="${tmp#* }"
1.9572 @@ -34437,20 +35061,19 @@
1.9573 done
1.9574 IFS="$IFS_save"
1.9575 else
1.9576 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CXXCPP (as $path) failed, using $path directly." >&5
1.9577 -$as_echo "$as_me: Resolving CXXCPP (as $path) failed, using $path directly." >&6;}
1.9578 + # This is an absolute path, we can use it without further modifications.
1.9579 new_path="$path"
1.9580 fi
1.9581
1.9582 if test "x$new_path" = x; then
1.9583 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$complete\", is not found." >&5
1.9584 -$as_echo "$as_me: The path of CXXCPP, which resolves as \"$complete\", is not found." >&6;}
1.9585 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5
1.9586 +$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;}
1.9587 has_space=`$ECHO "$complete" | $GREP " "`
1.9588 if test "x$has_space" != x; then
1.9589 { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.9590 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.9591 fi
1.9592 - as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5
1.9593 + as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
1.9594 fi
1.9595 fi
1.9596
1.9597 @@ -34462,226 +35085,315 @@
1.9598 fi
1.9599
1.9600 if test "x$complete" != "x$new_complete"; then
1.9601 - CXXCPP="$new_complete"
1.9602 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXXCPP to \"$new_complete\"" >&5
1.9603 -$as_echo "$as_me: Rewriting CXXCPP to \"$new_complete\"" >&6;}
1.9604 - fi
1.9605 -
1.9606 -
1.9607 - if test "x$COMPILE_TYPE" != "xcross"; then
1.9608 - # If we are not cross compiling, use the same compilers for
1.9609 - # building the build platform executables. The cross-compilation
1.9610 - # case needed to be done earlier, but this can only be done after
1.9611 - # the native tools have been localized.
1.9612 - BUILD_CC="$CC"
1.9613 - BUILD_CXX="$CXX"
1.9614 - BUILD_LD="$LD"
1.9615 - fi
1.9616 -
1.9617 - # for solaris we really need solaris tools, and not gnu equivalent
1.9618 - # these seems to normally reside in /usr/ccs/bin so add that to path before
1.9619 - # starting to probe
1.9620 - #
1.9621 - # NOTE: I add this /usr/ccs/bin after TOOLS but before OLD_PATH
1.9622 - # so that it can be overriden --with-tools-dir
1.9623 - if test "x$OPENJDK_BUILD_OS" = xsolaris; then
1.9624 - PATH="${TOOLS_DIR}:/usr/ccs/bin:${OLD_PATH}"
1.9625 - fi
1.9626 -
1.9627 - # Find the right assembler.
1.9628 - if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.9629 -
1.9630 -
1.9631 - # Publish this variable in the help.
1.9632 -
1.9633 -
1.9634 - if test "x$AS" = x; then
1.9635 - # The variable is not set by user, try to locate tool using the code snippet
1.9636 - for ac_prog in as
1.9637 -do
1.9638 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.9639 -set dummy $ac_prog; ac_word=$2
1.9640 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.9641 -$as_echo_n "checking for $ac_word... " >&6; }
1.9642 -if ${ac_cv_path_AS+:} false; then :
1.9643 - $as_echo_n "(cached) " >&6
1.9644 -else
1.9645 - case $AS in
1.9646 - [\\/]* | ?:[\\/]*)
1.9647 - ac_cv_path_AS="$AS" # Let the user override the test with a path.
1.9648 - ;;
1.9649 - *)
1.9650 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.9651 -for as_dir in $PATH
1.9652 -do
1.9653 - IFS=$as_save_IFS
1.9654 - test -z "$as_dir" && as_dir=.
1.9655 - for ac_exec_ext in '' $ac_executable_extensions; do
1.9656 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.9657 - ac_cv_path_AS="$as_dir/$ac_word$ac_exec_ext"
1.9658 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.9659 - break 2
1.9660 - fi
1.9661 -done
1.9662 - done
1.9663 -IFS=$as_save_IFS
1.9664 -
1.9665 - ;;
1.9666 -esac
1.9667 -fi
1.9668 -AS=$ac_cv_path_AS
1.9669 -if test -n "$AS"; then
1.9670 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
1.9671 -$as_echo "$AS" >&6; }
1.9672 -else
1.9673 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.9674 -$as_echo "no" >&6; }
1.9675 -fi
1.9676 -
1.9677 -
1.9678 - test -n "$AS" && break
1.9679 -done
1.9680 -
1.9681 - else
1.9682 - # The variable is set, but is it from the command line or the environment?
1.9683 -
1.9684 - # Try to remove the string !AS! from our list.
1.9685 - try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!AS!/}
1.9686 - if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.9687 - # If it failed, the variable was not from the command line. Ignore it,
1.9688 - # but warn the user (except for BASH, which is always set by the calling BASH).
1.9689 - if test "xAS" != xBASH; then
1.9690 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of AS from the environment. Use command line variables instead." >&5
1.9691 -$as_echo "$as_me: WARNING: Ignoring value of AS from the environment. Use command line variables instead." >&2;}
1.9692 - fi
1.9693 - # Try to locate tool using the code snippet
1.9694 - for ac_prog in as
1.9695 -do
1.9696 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.9697 -set dummy $ac_prog; ac_word=$2
1.9698 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.9699 -$as_echo_n "checking for $ac_word... " >&6; }
1.9700 -if ${ac_cv_path_AS+:} false; then :
1.9701 - $as_echo_n "(cached) " >&6
1.9702 -else
1.9703 - case $AS in
1.9704 - [\\/]* | ?:[\\/]*)
1.9705 - ac_cv_path_AS="$AS" # Let the user override the test with a path.
1.9706 - ;;
1.9707 - *)
1.9708 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.9709 -for as_dir in $PATH
1.9710 -do
1.9711 - IFS=$as_save_IFS
1.9712 - test -z "$as_dir" && as_dir=.
1.9713 - for ac_exec_ext in '' $ac_executable_extensions; do
1.9714 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.9715 - ac_cv_path_AS="$as_dir/$ac_word$ac_exec_ext"
1.9716 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.9717 - break 2
1.9718 - fi
1.9719 -done
1.9720 - done
1.9721 -IFS=$as_save_IFS
1.9722 -
1.9723 - ;;
1.9724 -esac
1.9725 -fi
1.9726 -AS=$ac_cv_path_AS
1.9727 -if test -n "$AS"; then
1.9728 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
1.9729 -$as_echo "$AS" >&6; }
1.9730 -else
1.9731 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.9732 -$as_echo "no" >&6; }
1.9733 -fi
1.9734 -
1.9735 -
1.9736 - test -n "$AS" && break
1.9737 -done
1.9738 -
1.9739 - else
1.9740 - # If it succeeded, then it was overridden by the user. We will use it
1.9741 - # for the tool.
1.9742 -
1.9743 - # First remove it from the list of overridden variables, so we can test
1.9744 - # for unknown variables in the end.
1.9745 - CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.9746 -
1.9747 - # Check if the provided tool contains a complete path.
1.9748 - tool_specified="$AS"
1.9749 - tool_basename="${tool_specified##*/}"
1.9750 - if test "x$tool_basename" = "x$tool_specified"; then
1.9751 - # A command without a complete path is provided, search $PATH.
1.9752 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool AS=$tool_basename" >&5
1.9753 -$as_echo "$as_me: Will search for user supplied tool AS=$tool_basename" >&6;}
1.9754 - # Extract the first word of "$tool_basename", so it can be a program name with args.
1.9755 -set dummy $tool_basename; ac_word=$2
1.9756 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.9757 -$as_echo_n "checking for $ac_word... " >&6; }
1.9758 -if ${ac_cv_path_AS+:} false; then :
1.9759 - $as_echo_n "(cached) " >&6
1.9760 -else
1.9761 - case $AS in
1.9762 - [\\/]* | ?:[\\/]*)
1.9763 - ac_cv_path_AS="$AS" # Let the user override the test with a path.
1.9764 - ;;
1.9765 - *)
1.9766 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.9767 -for as_dir in $PATH
1.9768 -do
1.9769 - IFS=$as_save_IFS
1.9770 - test -z "$as_dir" && as_dir=.
1.9771 - for ac_exec_ext in '' $ac_executable_extensions; do
1.9772 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.9773 - ac_cv_path_AS="$as_dir/$ac_word$ac_exec_ext"
1.9774 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.9775 - break 2
1.9776 - fi
1.9777 -done
1.9778 - done
1.9779 -IFS=$as_save_IFS
1.9780 -
1.9781 - ;;
1.9782 -esac
1.9783 -fi
1.9784 -AS=$ac_cv_path_AS
1.9785 -if test -n "$AS"; then
1.9786 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
1.9787 -$as_echo "$AS" >&6; }
1.9788 -else
1.9789 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.9790 -$as_echo "no" >&6; }
1.9791 -fi
1.9792 -
1.9793 -
1.9794 - if test "x$AS" = x; then
1.9795 - as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.9796 - fi
1.9797 - else
1.9798 - # Otherwise we believe it is a complete path. Use it as it is.
1.9799 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool AS=$tool_specified" >&5
1.9800 -$as_echo "$as_me: Will use user supplied tool AS=$tool_specified" >&6;}
1.9801 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AS" >&5
1.9802 -$as_echo_n "checking for AS... " >&6; }
1.9803 - if test ! -x "$tool_specified"; then
1.9804 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.9805 -$as_echo "not found" >&6; }
1.9806 - as_fn_error $? "User supplied tool AS=$tool_specified does not exist or is not executable" "$LINENO" 5
1.9807 - fi
1.9808 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.9809 -$as_echo "$tool_specified" >&6; }
1.9810 - fi
1.9811 - fi
1.9812 - fi
1.9813 -
1.9814 -
1.9815 -
1.9816 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.9817 -
1.9818 - # First separate the path from the arguments. This will split at the first
1.9819 - # space.
1.9820 - complete="$AS"
1.9821 + MCS="$new_complete"
1.9822 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MCS to \"$new_complete\"" >&5
1.9823 +$as_echo "$as_me: Rewriting MCS to \"$new_complete\"" >&6;}
1.9824 + fi
1.9825 +
1.9826 + elif test "x$OPENJDK_TARGET_OS" != xwindows; then
1.9827 + # FIXME: we should unify this with the solaris case above.
1.9828 +
1.9829 +
1.9830 + # Publish this variable in the help.
1.9831 +
1.9832 +
1.9833 + if test "x$STRIP" = x; then
1.9834 + # The variable is not set by user, try to locate tool using the code snippet
1.9835 + if test -n "$ac_tool_prefix"; then
1.9836 + for ac_prog in strip
1.9837 + do
1.9838 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.9839 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.9840 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.9841 +$as_echo_n "checking for $ac_word... " >&6; }
1.9842 +if ${ac_cv_prog_STRIP+:} false; then :
1.9843 + $as_echo_n "(cached) " >&6
1.9844 +else
1.9845 + if test -n "$STRIP"; then
1.9846 + ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
1.9847 +else
1.9848 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.9849 +for as_dir in $PATH
1.9850 +do
1.9851 + IFS=$as_save_IFS
1.9852 + test -z "$as_dir" && as_dir=.
1.9853 + for ac_exec_ext in '' $ac_executable_extensions; do
1.9854 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.9855 + ac_cv_prog_STRIP="$ac_tool_prefix$ac_prog"
1.9856 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.9857 + break 2
1.9858 + fi
1.9859 +done
1.9860 + done
1.9861 +IFS=$as_save_IFS
1.9862 +
1.9863 +fi
1.9864 +fi
1.9865 +STRIP=$ac_cv_prog_STRIP
1.9866 +if test -n "$STRIP"; then
1.9867 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
1.9868 +$as_echo "$STRIP" >&6; }
1.9869 +else
1.9870 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.9871 +$as_echo "no" >&6; }
1.9872 +fi
1.9873 +
1.9874 +
1.9875 + test -n "$STRIP" && break
1.9876 + done
1.9877 +fi
1.9878 +if test -z "$STRIP"; then
1.9879 + ac_ct_STRIP=$STRIP
1.9880 + for ac_prog in strip
1.9881 +do
1.9882 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.9883 +set dummy $ac_prog; ac_word=$2
1.9884 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.9885 +$as_echo_n "checking for $ac_word... " >&6; }
1.9886 +if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
1.9887 + $as_echo_n "(cached) " >&6
1.9888 +else
1.9889 + if test -n "$ac_ct_STRIP"; then
1.9890 + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
1.9891 +else
1.9892 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.9893 +for as_dir in $PATH
1.9894 +do
1.9895 + IFS=$as_save_IFS
1.9896 + test -z "$as_dir" && as_dir=.
1.9897 + for ac_exec_ext in '' $ac_executable_extensions; do
1.9898 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.9899 + ac_cv_prog_ac_ct_STRIP="$ac_prog"
1.9900 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.9901 + break 2
1.9902 + fi
1.9903 +done
1.9904 + done
1.9905 +IFS=$as_save_IFS
1.9906 +
1.9907 +fi
1.9908 +fi
1.9909 +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
1.9910 +if test -n "$ac_ct_STRIP"; then
1.9911 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
1.9912 +$as_echo "$ac_ct_STRIP" >&6; }
1.9913 +else
1.9914 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.9915 +$as_echo "no" >&6; }
1.9916 +fi
1.9917 +
1.9918 +
1.9919 + test -n "$ac_ct_STRIP" && break
1.9920 +done
1.9921 +
1.9922 + if test "x$ac_ct_STRIP" = x; then
1.9923 + STRIP=""
1.9924 + else
1.9925 + case $cross_compiling:$ac_tool_warned in
1.9926 +yes:)
1.9927 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.9928 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.9929 +ac_tool_warned=yes ;;
1.9930 +esac
1.9931 + STRIP=$ac_ct_STRIP
1.9932 + fi
1.9933 +fi
1.9934 +
1.9935 + else
1.9936 + # The variable is set, but is it from the command line or the environment?
1.9937 +
1.9938 + # Try to remove the string !STRIP! from our list.
1.9939 + try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!STRIP!/}
1.9940 + if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.9941 + # If it failed, the variable was not from the command line. Ignore it,
1.9942 + # but warn the user (except for BASH, which is always set by the calling BASH).
1.9943 + if test "xSTRIP" != xBASH; then
1.9944 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of STRIP from the environment. Use command line variables instead." >&5
1.9945 +$as_echo "$as_me: WARNING: Ignoring value of STRIP from the environment. Use command line variables instead." >&2;}
1.9946 + fi
1.9947 + # Try to locate tool using the code snippet
1.9948 + if test -n "$ac_tool_prefix"; then
1.9949 + for ac_prog in strip
1.9950 + do
1.9951 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.9952 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.9953 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.9954 +$as_echo_n "checking for $ac_word... " >&6; }
1.9955 +if ${ac_cv_prog_STRIP+:} false; then :
1.9956 + $as_echo_n "(cached) " >&6
1.9957 +else
1.9958 + if test -n "$STRIP"; then
1.9959 + ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
1.9960 +else
1.9961 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.9962 +for as_dir in $PATH
1.9963 +do
1.9964 + IFS=$as_save_IFS
1.9965 + test -z "$as_dir" && as_dir=.
1.9966 + for ac_exec_ext in '' $ac_executable_extensions; do
1.9967 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.9968 + ac_cv_prog_STRIP="$ac_tool_prefix$ac_prog"
1.9969 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.9970 + break 2
1.9971 + fi
1.9972 +done
1.9973 + done
1.9974 +IFS=$as_save_IFS
1.9975 +
1.9976 +fi
1.9977 +fi
1.9978 +STRIP=$ac_cv_prog_STRIP
1.9979 +if test -n "$STRIP"; then
1.9980 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
1.9981 +$as_echo "$STRIP" >&6; }
1.9982 +else
1.9983 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.9984 +$as_echo "no" >&6; }
1.9985 +fi
1.9986 +
1.9987 +
1.9988 + test -n "$STRIP" && break
1.9989 + done
1.9990 +fi
1.9991 +if test -z "$STRIP"; then
1.9992 + ac_ct_STRIP=$STRIP
1.9993 + for ac_prog in strip
1.9994 +do
1.9995 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.9996 +set dummy $ac_prog; ac_word=$2
1.9997 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.9998 +$as_echo_n "checking for $ac_word... " >&6; }
1.9999 +if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
1.10000 + $as_echo_n "(cached) " >&6
1.10001 +else
1.10002 + if test -n "$ac_ct_STRIP"; then
1.10003 + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
1.10004 +else
1.10005 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.10006 +for as_dir in $PATH
1.10007 +do
1.10008 + IFS=$as_save_IFS
1.10009 + test -z "$as_dir" && as_dir=.
1.10010 + for ac_exec_ext in '' $ac_executable_extensions; do
1.10011 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.10012 + ac_cv_prog_ac_ct_STRIP="$ac_prog"
1.10013 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.10014 + break 2
1.10015 + fi
1.10016 +done
1.10017 + done
1.10018 +IFS=$as_save_IFS
1.10019 +
1.10020 +fi
1.10021 +fi
1.10022 +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
1.10023 +if test -n "$ac_ct_STRIP"; then
1.10024 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
1.10025 +$as_echo "$ac_ct_STRIP" >&6; }
1.10026 +else
1.10027 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.10028 +$as_echo "no" >&6; }
1.10029 +fi
1.10030 +
1.10031 +
1.10032 + test -n "$ac_ct_STRIP" && break
1.10033 +done
1.10034 +
1.10035 + if test "x$ac_ct_STRIP" = x; then
1.10036 + STRIP=""
1.10037 + else
1.10038 + case $cross_compiling:$ac_tool_warned in
1.10039 +yes:)
1.10040 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.10041 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.10042 +ac_tool_warned=yes ;;
1.10043 +esac
1.10044 + STRIP=$ac_ct_STRIP
1.10045 + fi
1.10046 +fi
1.10047 +
1.10048 + else
1.10049 + # If it succeeded, then it was overridden by the user. We will use it
1.10050 + # for the tool.
1.10051 +
1.10052 + # First remove it from the list of overridden variables, so we can test
1.10053 + # for unknown variables in the end.
1.10054 + CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.10055 +
1.10056 + # Check if the provided tool contains a complete path.
1.10057 + tool_specified="$STRIP"
1.10058 + tool_basename="${tool_specified##*/}"
1.10059 + if test "x$tool_basename" = "x$tool_specified"; then
1.10060 + # A command without a complete path is provided, search $PATH.
1.10061 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool STRIP=$tool_basename" >&5
1.10062 +$as_echo "$as_me: Will search for user supplied tool STRIP=$tool_basename" >&6;}
1.10063 + # Extract the first word of "$tool_basename", so it can be a program name with args.
1.10064 +set dummy $tool_basename; ac_word=$2
1.10065 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.10066 +$as_echo_n "checking for $ac_word... " >&6; }
1.10067 +if ${ac_cv_path_STRIP+:} false; then :
1.10068 + $as_echo_n "(cached) " >&6
1.10069 +else
1.10070 + case $STRIP in
1.10071 + [\\/]* | ?:[\\/]*)
1.10072 + ac_cv_path_STRIP="$STRIP" # Let the user override the test with a path.
1.10073 + ;;
1.10074 + *)
1.10075 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.10076 +for as_dir in $PATH
1.10077 +do
1.10078 + IFS=$as_save_IFS
1.10079 + test -z "$as_dir" && as_dir=.
1.10080 + for ac_exec_ext in '' $ac_executable_extensions; do
1.10081 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.10082 + ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext"
1.10083 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.10084 + break 2
1.10085 + fi
1.10086 +done
1.10087 + done
1.10088 +IFS=$as_save_IFS
1.10089 +
1.10090 + ;;
1.10091 +esac
1.10092 +fi
1.10093 +STRIP=$ac_cv_path_STRIP
1.10094 +if test -n "$STRIP"; then
1.10095 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
1.10096 +$as_echo "$STRIP" >&6; }
1.10097 +else
1.10098 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.10099 +$as_echo "no" >&6; }
1.10100 +fi
1.10101 +
1.10102 +
1.10103 + if test "x$STRIP" = x; then
1.10104 + as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.10105 + fi
1.10106 + else
1.10107 + # Otherwise we believe it is a complete path. Use it as it is.
1.10108 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool STRIP=$tool_specified" >&5
1.10109 +$as_echo "$as_me: Will use user supplied tool STRIP=$tool_specified" >&6;}
1.10110 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for STRIP" >&5
1.10111 +$as_echo_n "checking for STRIP... " >&6; }
1.10112 + if test ! -x "$tool_specified"; then
1.10113 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.10114 +$as_echo "not found" >&6; }
1.10115 + as_fn_error $? "User supplied tool STRIP=$tool_specified does not exist or is not executable" "$LINENO" 5
1.10116 + fi
1.10117 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.10118 +$as_echo "$tool_specified" >&6; }
1.10119 + fi
1.10120 + fi
1.10121 + fi
1.10122 +
1.10123 +
1.10124 +
1.10125 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.10126 +
1.10127 + # First separate the path from the arguments. This will split at the first
1.10128 + # space.
1.10129 + complete="$STRIP"
1.10130 path="${complete%% *}"
1.10131 tmp="$complete EOL"
1.10132 arguments="${tmp#* }"
1.10133 @@ -34717,14 +35429,14 @@
1.10134 fi
1.10135 if test "x$new_path" = x; then
1.10136 # It's still not found. Now this is an unrecoverable error.
1.10137 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$complete\", is not found." >&5
1.10138 -$as_echo "$as_me: The path of AS, which resolves as \"$complete\", is not found." >&6;}
1.10139 - has_space=`$ECHO "$complete" | $GREP " "`
1.10140 - if test "x$has_space" != x; then
1.10141 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.10142 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.10143 - fi
1.10144 - as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5
1.10145 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
1.10146 +$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
1.10147 + has_space=`$ECHO "$complete" | $GREP " "`
1.10148 + if test "x$has_space" != x; then
1.10149 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.10150 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.10151 + fi
1.10152 + as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.10153 fi
1.10154 fi
1.10155
1.10156 @@ -34744,11 +35456,11 @@
1.10157 elif test -f "${new_path}.cmd"; then
1.10158 input_to_shortpath="${new_path}.cmd"
1.10159 else
1.10160 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$new_path\", is invalid." >&5
1.10161 -$as_echo "$as_me: The path of AS, which resolves as \"$new_path\", is invalid." >&6;}
1.10162 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$new_path\", is invalid." >&5
1.10163 +$as_echo "$as_me: The path of STRIP, which resolves as \"$new_path\", is invalid." >&6;}
1.10164 { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.10165 $as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.10166 - as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5
1.10167 + as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.10168 fi
1.10169 else
1.10170 input_to_shortpath="$new_path"
1.10171 @@ -34795,7 +35507,7 @@
1.10172
1.10173 # First separate the path from the arguments. This will split at the first
1.10174 # space.
1.10175 - complete="$AS"
1.10176 + complete="$STRIP"
1.10177 path="${complete%% *}"
1.10178 tmp="$complete EOL"
1.10179 arguments="${tmp#* }"
1.10180 @@ -34840,14 +35552,14 @@
1.10181
1.10182 if test "x$new_path" = x; then
1.10183 # It's still not found. Now this is an unrecoverable error.
1.10184 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$complete\", is not found." >&5
1.10185 -$as_echo "$as_me: The path of AS, which resolves as \"$complete\", is not found." >&6;}
1.10186 - has_space=`$ECHO "$complete" | $GREP " "`
1.10187 - if test "x$has_space" != x; then
1.10188 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.10189 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.10190 - fi
1.10191 - as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5
1.10192 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
1.10193 +$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
1.10194 + has_space=`$ECHO "$complete" | $GREP " "`
1.10195 + if test "x$has_space" != x; then
1.10196 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.10197 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.10198 + fi
1.10199 + as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.10200 fi
1.10201 fi
1.10202
1.10203 @@ -34893,7 +35605,7 @@
1.10204 # We're on a posix platform. Hooray! :)
1.10205 # First separate the path from the arguments. This will split at the first
1.10206 # space.
1.10207 - complete="$AS"
1.10208 + complete="$STRIP"
1.10209 path="${complete%% *}"
1.10210 tmp="$complete EOL"
1.10211 arguments="${tmp#* }"
1.10212 @@ -34912,20 +35624,19 @@
1.10213 done
1.10214 IFS="$IFS_save"
1.10215 else
1.10216 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving AS (as $path) failed, using $path directly." >&5
1.10217 -$as_echo "$as_me: Resolving AS (as $path) failed, using $path directly." >&6;}
1.10218 + # This is an absolute path, we can use it without further modifications.
1.10219 new_path="$path"
1.10220 fi
1.10221
1.10222 if test "x$new_path" = x; then
1.10223 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$complete\", is not found." >&5
1.10224 -$as_echo "$as_me: The path of AS, which resolves as \"$complete\", is not found." >&6;}
1.10225 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
1.10226 +$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
1.10227 has_space=`$ECHO "$complete" | $GREP " "`
1.10228 if test "x$has_space" != x; then
1.10229 { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.10230 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.10231 fi
1.10232 - as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5
1.10233 + as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.10234 fi
1.10235 fi
1.10236
1.10237 @@ -34937,17 +35648,54 @@
1.10238 fi
1.10239
1.10240 if test "x$complete" != "x$new_complete"; then
1.10241 - AS="$new_complete"
1.10242 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AS to \"$new_complete\"" >&5
1.10243 -$as_echo "$as_me: Rewriting AS to \"$new_complete\"" >&6;}
1.10244 - fi
1.10245 -
1.10246 - else
1.10247 - AS="$CC -c"
1.10248 - fi
1.10249 -
1.10250 -
1.10251 - if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.10252 + STRIP="$new_complete"
1.10253 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5
1.10254 +$as_echo "$as_me: Rewriting STRIP to \"$new_complete\"" >&6;}
1.10255 + fi
1.10256 +
1.10257 + # Extract the first word of "otool", so it can be a program name with args.
1.10258 +set dummy otool; ac_word=$2
1.10259 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.10260 +$as_echo_n "checking for $ac_word... " >&6; }
1.10261 +if ${ac_cv_path_OTOOL+:} false; then :
1.10262 + $as_echo_n "(cached) " >&6
1.10263 +else
1.10264 + case $OTOOL in
1.10265 + [\\/]* | ?:[\\/]*)
1.10266 + ac_cv_path_OTOOL="$OTOOL" # Let the user override the test with a path.
1.10267 + ;;
1.10268 + *)
1.10269 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.10270 +for as_dir in $PATH
1.10271 +do
1.10272 + IFS=$as_save_IFS
1.10273 + test -z "$as_dir" && as_dir=.
1.10274 + for ac_exec_ext in '' $ac_executable_extensions; do
1.10275 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.10276 + ac_cv_path_OTOOL="$as_dir/$ac_word$ac_exec_ext"
1.10277 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.10278 + break 2
1.10279 + fi
1.10280 +done
1.10281 + done
1.10282 +IFS=$as_save_IFS
1.10283 +
1.10284 + ;;
1.10285 +esac
1.10286 +fi
1.10287 +OTOOL=$ac_cv_path_OTOOL
1.10288 +if test -n "$OTOOL"; then
1.10289 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
1.10290 +$as_echo "$OTOOL" >&6; }
1.10291 +else
1.10292 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.10293 +$as_echo "no" >&6; }
1.10294 +fi
1.10295 +
1.10296 +
1.10297 + if test "x$OTOOL" = "x"; then
1.10298 + OTOOL="true"
1.10299 + fi
1.10300
1.10301
1.10302 # Publish this variable in the help.
1.10303 @@ -34955,39 +35703,37 @@
1.10304
1.10305 if test "x$NM" = x; then
1.10306 # The variable is not set by user, try to locate tool using the code snippet
1.10307 - for ac_prog in nm
1.10308 -do
1.10309 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.10310 -set dummy $ac_prog; ac_word=$2
1.10311 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.10312 -$as_echo_n "checking for $ac_word... " >&6; }
1.10313 -if ${ac_cv_path_NM+:} false; then :
1.10314 - $as_echo_n "(cached) " >&6
1.10315 -else
1.10316 - case $NM in
1.10317 - [\\/]* | ?:[\\/]*)
1.10318 - ac_cv_path_NM="$NM" # Let the user override the test with a path.
1.10319 - ;;
1.10320 - *)
1.10321 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.10322 -for as_dir in $PATH
1.10323 -do
1.10324 - IFS=$as_save_IFS
1.10325 - test -z "$as_dir" && as_dir=.
1.10326 - for ac_exec_ext in '' $ac_executable_extensions; do
1.10327 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.10328 - ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext"
1.10329 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.10330 - break 2
1.10331 - fi
1.10332 -done
1.10333 - done
1.10334 -IFS=$as_save_IFS
1.10335 -
1.10336 - ;;
1.10337 -esac
1.10338 -fi
1.10339 -NM=$ac_cv_path_NM
1.10340 + if test -n "$ac_tool_prefix"; then
1.10341 + for ac_prog in nm
1.10342 + do
1.10343 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.10344 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.10345 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.10346 +$as_echo_n "checking for $ac_word... " >&6; }
1.10347 +if ${ac_cv_prog_NM+:} false; then :
1.10348 + $as_echo_n "(cached) " >&6
1.10349 +else
1.10350 + if test -n "$NM"; then
1.10351 + ac_cv_prog_NM="$NM" # Let the user override the test.
1.10352 +else
1.10353 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.10354 +for as_dir in $PATH
1.10355 +do
1.10356 + IFS=$as_save_IFS
1.10357 + test -z "$as_dir" && as_dir=.
1.10358 + for ac_exec_ext in '' $ac_executable_extensions; do
1.10359 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.10360 + ac_cv_prog_NM="$ac_tool_prefix$ac_prog"
1.10361 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.10362 + break 2
1.10363 + fi
1.10364 +done
1.10365 + done
1.10366 +IFS=$as_save_IFS
1.10367 +
1.10368 +fi
1.10369 +fi
1.10370 +NM=$ac_cv_prog_NM
1.10371 if test -n "$NM"; then
1.10372 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
1.10373 $as_echo "$NM" >&6; }
1.10374 @@ -34997,8 +35743,65 @@
1.10375 fi
1.10376
1.10377
1.10378 - test -n "$NM" && break
1.10379 -done
1.10380 + test -n "$NM" && break
1.10381 + done
1.10382 +fi
1.10383 +if test -z "$NM"; then
1.10384 + ac_ct_NM=$NM
1.10385 + for ac_prog in nm
1.10386 +do
1.10387 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.10388 +set dummy $ac_prog; ac_word=$2
1.10389 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.10390 +$as_echo_n "checking for $ac_word... " >&6; }
1.10391 +if ${ac_cv_prog_ac_ct_NM+:} false; then :
1.10392 + $as_echo_n "(cached) " >&6
1.10393 +else
1.10394 + if test -n "$ac_ct_NM"; then
1.10395 + ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test.
1.10396 +else
1.10397 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.10398 +for as_dir in $PATH
1.10399 +do
1.10400 + IFS=$as_save_IFS
1.10401 + test -z "$as_dir" && as_dir=.
1.10402 + for ac_exec_ext in '' $ac_executable_extensions; do
1.10403 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.10404 + ac_cv_prog_ac_ct_NM="$ac_prog"
1.10405 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.10406 + break 2
1.10407 + fi
1.10408 +done
1.10409 + done
1.10410 +IFS=$as_save_IFS
1.10411 +
1.10412 +fi
1.10413 +fi
1.10414 +ac_ct_NM=$ac_cv_prog_ac_ct_NM
1.10415 +if test -n "$ac_ct_NM"; then
1.10416 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NM" >&5
1.10417 +$as_echo "$ac_ct_NM" >&6; }
1.10418 +else
1.10419 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.10420 +$as_echo "no" >&6; }
1.10421 +fi
1.10422 +
1.10423 +
1.10424 + test -n "$ac_ct_NM" && break
1.10425 +done
1.10426 +
1.10427 + if test "x$ac_ct_NM" = x; then
1.10428 + NM=""
1.10429 + else
1.10430 + case $cross_compiling:$ac_tool_warned in
1.10431 +yes:)
1.10432 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.10433 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.10434 +ac_tool_warned=yes ;;
1.10435 +esac
1.10436 + NM=$ac_ct_NM
1.10437 + fi
1.10438 +fi
1.10439
1.10440 else
1.10441 # The variable is set, but is it from the command line or the environment?
1.10442 @@ -35013,39 +35816,37 @@
1.10443 $as_echo "$as_me: WARNING: Ignoring value of NM from the environment. Use command line variables instead." >&2;}
1.10444 fi
1.10445 # Try to locate tool using the code snippet
1.10446 - for ac_prog in nm
1.10447 -do
1.10448 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.10449 -set dummy $ac_prog; ac_word=$2
1.10450 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.10451 -$as_echo_n "checking for $ac_word... " >&6; }
1.10452 -if ${ac_cv_path_NM+:} false; then :
1.10453 - $as_echo_n "(cached) " >&6
1.10454 -else
1.10455 - case $NM in
1.10456 - [\\/]* | ?:[\\/]*)
1.10457 - ac_cv_path_NM="$NM" # Let the user override the test with a path.
1.10458 - ;;
1.10459 - *)
1.10460 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.10461 -for as_dir in $PATH
1.10462 -do
1.10463 - IFS=$as_save_IFS
1.10464 - test -z "$as_dir" && as_dir=.
1.10465 - for ac_exec_ext in '' $ac_executable_extensions; do
1.10466 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.10467 - ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext"
1.10468 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.10469 - break 2
1.10470 - fi
1.10471 -done
1.10472 - done
1.10473 -IFS=$as_save_IFS
1.10474 -
1.10475 - ;;
1.10476 -esac
1.10477 -fi
1.10478 -NM=$ac_cv_path_NM
1.10479 + if test -n "$ac_tool_prefix"; then
1.10480 + for ac_prog in nm
1.10481 + do
1.10482 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.10483 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.10484 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.10485 +$as_echo_n "checking for $ac_word... " >&6; }
1.10486 +if ${ac_cv_prog_NM+:} false; then :
1.10487 + $as_echo_n "(cached) " >&6
1.10488 +else
1.10489 + if test -n "$NM"; then
1.10490 + ac_cv_prog_NM="$NM" # Let the user override the test.
1.10491 +else
1.10492 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.10493 +for as_dir in $PATH
1.10494 +do
1.10495 + IFS=$as_save_IFS
1.10496 + test -z "$as_dir" && as_dir=.
1.10497 + for ac_exec_ext in '' $ac_executable_extensions; do
1.10498 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.10499 + ac_cv_prog_NM="$ac_tool_prefix$ac_prog"
1.10500 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.10501 + break 2
1.10502 + fi
1.10503 +done
1.10504 + done
1.10505 +IFS=$as_save_IFS
1.10506 +
1.10507 +fi
1.10508 +fi
1.10509 +NM=$ac_cv_prog_NM
1.10510 if test -n "$NM"; then
1.10511 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
1.10512 $as_echo "$NM" >&6; }
1.10513 @@ -35055,8 +35856,65 @@
1.10514 fi
1.10515
1.10516
1.10517 - test -n "$NM" && break
1.10518 -done
1.10519 + test -n "$NM" && break
1.10520 + done
1.10521 +fi
1.10522 +if test -z "$NM"; then
1.10523 + ac_ct_NM=$NM
1.10524 + for ac_prog in nm
1.10525 +do
1.10526 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.10527 +set dummy $ac_prog; ac_word=$2
1.10528 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.10529 +$as_echo_n "checking for $ac_word... " >&6; }
1.10530 +if ${ac_cv_prog_ac_ct_NM+:} false; then :
1.10531 + $as_echo_n "(cached) " >&6
1.10532 +else
1.10533 + if test -n "$ac_ct_NM"; then
1.10534 + ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test.
1.10535 +else
1.10536 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.10537 +for as_dir in $PATH
1.10538 +do
1.10539 + IFS=$as_save_IFS
1.10540 + test -z "$as_dir" && as_dir=.
1.10541 + for ac_exec_ext in '' $ac_executable_extensions; do
1.10542 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.10543 + ac_cv_prog_ac_ct_NM="$ac_prog"
1.10544 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.10545 + break 2
1.10546 + fi
1.10547 +done
1.10548 + done
1.10549 +IFS=$as_save_IFS
1.10550 +
1.10551 +fi
1.10552 +fi
1.10553 +ac_ct_NM=$ac_cv_prog_ac_ct_NM
1.10554 +if test -n "$ac_ct_NM"; then
1.10555 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NM" >&5
1.10556 +$as_echo "$ac_ct_NM" >&6; }
1.10557 +else
1.10558 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.10559 +$as_echo "no" >&6; }
1.10560 +fi
1.10561 +
1.10562 +
1.10563 + test -n "$ac_ct_NM" && break
1.10564 +done
1.10565 +
1.10566 + if test "x$ac_ct_NM" = x; then
1.10567 + NM=""
1.10568 + else
1.10569 + case $cross_compiling:$ac_tool_warned in
1.10570 +yes:)
1.10571 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.10572 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.10573 +ac_tool_warned=yes ;;
1.10574 +esac
1.10575 + NM=$ac_ct_NM
1.10576 + fi
1.10577 +fi
1.10578
1.10579 else
1.10580 # If it succeeded, then it was overridden by the user. We will use it
1.10581 @@ -35370,8 +36228,7 @@
1.10582 done
1.10583 IFS="$IFS_save"
1.10584 else
1.10585 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving NM (as $path) failed, using $path directly." >&5
1.10586 -$as_echo "$as_me: Resolving NM (as $path) failed, using $path directly." >&6;}
1.10587 + # This is an absolute path, we can use it without further modifications.
1.10588 new_path="$path"
1.10589 fi
1.10590
1.10591 @@ -35400,198 +36257,317 @@
1.10592 $as_echo "$as_me: Rewriting NM to \"$new_complete\"" >&6;}
1.10593 fi
1.10594
1.10595 -
1.10596 -
1.10597 - # Publish this variable in the help.
1.10598 -
1.10599 -
1.10600 - if test "x$GNM" = x; then
1.10601 - # The variable is not set by user, try to locate tool using the code snippet
1.10602 - for ac_prog in gnm
1.10603 -do
1.10604 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.10605 -set dummy $ac_prog; ac_word=$2
1.10606 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.10607 -$as_echo_n "checking for $ac_word... " >&6; }
1.10608 -if ${ac_cv_path_GNM+:} false; then :
1.10609 - $as_echo_n "(cached) " >&6
1.10610 -else
1.10611 - case $GNM in
1.10612 - [\\/]* | ?:[\\/]*)
1.10613 - ac_cv_path_GNM="$GNM" # Let the user override the test with a path.
1.10614 - ;;
1.10615 - *)
1.10616 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.10617 -for as_dir in $PATH
1.10618 -do
1.10619 - IFS=$as_save_IFS
1.10620 - test -z "$as_dir" && as_dir=.
1.10621 - for ac_exec_ext in '' $ac_executable_extensions; do
1.10622 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.10623 - ac_cv_path_GNM="$as_dir/$ac_word$ac_exec_ext"
1.10624 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.10625 - break 2
1.10626 - fi
1.10627 -done
1.10628 - done
1.10629 -IFS=$as_save_IFS
1.10630 -
1.10631 - ;;
1.10632 -esac
1.10633 -fi
1.10634 -GNM=$ac_cv_path_GNM
1.10635 -if test -n "$GNM"; then
1.10636 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNM" >&5
1.10637 -$as_echo "$GNM" >&6; }
1.10638 -else
1.10639 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.10640 -$as_echo "no" >&6; }
1.10641 -fi
1.10642 -
1.10643 -
1.10644 - test -n "$GNM" && break
1.10645 -done
1.10646 -
1.10647 - else
1.10648 - # The variable is set, but is it from the command line or the environment?
1.10649 -
1.10650 - # Try to remove the string !GNM! from our list.
1.10651 - try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!GNM!/}
1.10652 - if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.10653 - # If it failed, the variable was not from the command line. Ignore it,
1.10654 - # but warn the user (except for BASH, which is always set by the calling BASH).
1.10655 - if test "xGNM" != xBASH; then
1.10656 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of GNM from the environment. Use command line variables instead." >&5
1.10657 -$as_echo "$as_me: WARNING: Ignoring value of GNM from the environment. Use command line variables instead." >&2;}
1.10658 - fi
1.10659 - # Try to locate tool using the code snippet
1.10660 - for ac_prog in gnm
1.10661 -do
1.10662 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.10663 -set dummy $ac_prog; ac_word=$2
1.10664 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.10665 -$as_echo_n "checking for $ac_word... " >&6; }
1.10666 -if ${ac_cv_path_GNM+:} false; then :
1.10667 - $as_echo_n "(cached) " >&6
1.10668 -else
1.10669 - case $GNM in
1.10670 - [\\/]* | ?:[\\/]*)
1.10671 - ac_cv_path_GNM="$GNM" # Let the user override the test with a path.
1.10672 - ;;
1.10673 - *)
1.10674 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.10675 -for as_dir in $PATH
1.10676 -do
1.10677 - IFS=$as_save_IFS
1.10678 - test -z "$as_dir" && as_dir=.
1.10679 - for ac_exec_ext in '' $ac_executable_extensions; do
1.10680 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.10681 - ac_cv_path_GNM="$as_dir/$ac_word$ac_exec_ext"
1.10682 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.10683 - break 2
1.10684 - fi
1.10685 -done
1.10686 - done
1.10687 -IFS=$as_save_IFS
1.10688 -
1.10689 - ;;
1.10690 -esac
1.10691 -fi
1.10692 -GNM=$ac_cv_path_GNM
1.10693 -if test -n "$GNM"; then
1.10694 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNM" >&5
1.10695 -$as_echo "$GNM" >&6; }
1.10696 -else
1.10697 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.10698 -$as_echo "no" >&6; }
1.10699 -fi
1.10700 -
1.10701 -
1.10702 - test -n "$GNM" && break
1.10703 -done
1.10704 -
1.10705 - else
1.10706 - # If it succeeded, then it was overridden by the user. We will use it
1.10707 - # for the tool.
1.10708 -
1.10709 - # First remove it from the list of overridden variables, so we can test
1.10710 - # for unknown variables in the end.
1.10711 - CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.10712 -
1.10713 - # Check if the provided tool contains a complete path.
1.10714 - tool_specified="$GNM"
1.10715 - tool_basename="${tool_specified##*/}"
1.10716 - if test "x$tool_basename" = "x$tool_specified"; then
1.10717 - # A command without a complete path is provided, search $PATH.
1.10718 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool GNM=$tool_basename" >&5
1.10719 -$as_echo "$as_me: Will search for user supplied tool GNM=$tool_basename" >&6;}
1.10720 - # Extract the first word of "$tool_basename", so it can be a program name with args.
1.10721 -set dummy $tool_basename; ac_word=$2
1.10722 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.10723 -$as_echo_n "checking for $ac_word... " >&6; }
1.10724 -if ${ac_cv_path_GNM+:} false; then :
1.10725 - $as_echo_n "(cached) " >&6
1.10726 -else
1.10727 - case $GNM in
1.10728 - [\\/]* | ?:[\\/]*)
1.10729 - ac_cv_path_GNM="$GNM" # Let the user override the test with a path.
1.10730 - ;;
1.10731 - *)
1.10732 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.10733 -for as_dir in $PATH
1.10734 -do
1.10735 - IFS=$as_save_IFS
1.10736 - test -z "$as_dir" && as_dir=.
1.10737 - for ac_exec_ext in '' $ac_executable_extensions; do
1.10738 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.10739 - ac_cv_path_GNM="$as_dir/$ac_word$ac_exec_ext"
1.10740 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.10741 - break 2
1.10742 - fi
1.10743 -done
1.10744 - done
1.10745 -IFS=$as_save_IFS
1.10746 -
1.10747 - ;;
1.10748 -esac
1.10749 -fi
1.10750 -GNM=$ac_cv_path_GNM
1.10751 -if test -n "$GNM"; then
1.10752 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNM" >&5
1.10753 -$as_echo "$GNM" >&6; }
1.10754 -else
1.10755 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.10756 -$as_echo "no" >&6; }
1.10757 -fi
1.10758 -
1.10759 -
1.10760 - if test "x$GNM" = x; then
1.10761 - as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.10762 - fi
1.10763 - else
1.10764 - # Otherwise we believe it is a complete path. Use it as it is.
1.10765 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool GNM=$tool_specified" >&5
1.10766 -$as_echo "$as_me: Will use user supplied tool GNM=$tool_specified" >&6;}
1.10767 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNM" >&5
1.10768 -$as_echo_n "checking for GNM... " >&6; }
1.10769 - if test ! -x "$tool_specified"; then
1.10770 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.10771 -$as_echo "not found" >&6; }
1.10772 - as_fn_error $? "User supplied tool GNM=$tool_specified does not exist or is not executable" "$LINENO" 5
1.10773 - fi
1.10774 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.10775 -$as_echo "$tool_specified" >&6; }
1.10776 - fi
1.10777 - fi
1.10778 - fi
1.10779 -
1.10780 -
1.10781 -
1.10782 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.10783 -
1.10784 - # First separate the path from the arguments. This will split at the first
1.10785 - # space.
1.10786 - complete="$GNM"
1.10787 + GNM="$NM"
1.10788 +
1.10789 + fi
1.10790 +
1.10791 + # objcopy is used for moving debug symbols to separate files when
1.10792 + # full debug symbols are enabled.
1.10793 + if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
1.10794 +
1.10795 +
1.10796 + # Publish this variable in the help.
1.10797 +
1.10798 +
1.10799 + if test "x$OBJCOPY" = x; then
1.10800 + # The variable is not set by user, try to locate tool using the code snippet
1.10801 + if test -n "$ac_tool_prefix"; then
1.10802 + for ac_prog in gobjcopy objcopy
1.10803 + do
1.10804 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.10805 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.10806 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.10807 +$as_echo_n "checking for $ac_word... " >&6; }
1.10808 +if ${ac_cv_prog_OBJCOPY+:} false; then :
1.10809 + $as_echo_n "(cached) " >&6
1.10810 +else
1.10811 + if test -n "$OBJCOPY"; then
1.10812 + ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
1.10813 +else
1.10814 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.10815 +for as_dir in $PATH
1.10816 +do
1.10817 + IFS=$as_save_IFS
1.10818 + test -z "$as_dir" && as_dir=.
1.10819 + for ac_exec_ext in '' $ac_executable_extensions; do
1.10820 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.10821 + ac_cv_prog_OBJCOPY="$ac_tool_prefix$ac_prog"
1.10822 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.10823 + break 2
1.10824 + fi
1.10825 +done
1.10826 + done
1.10827 +IFS=$as_save_IFS
1.10828 +
1.10829 +fi
1.10830 +fi
1.10831 +OBJCOPY=$ac_cv_prog_OBJCOPY
1.10832 +if test -n "$OBJCOPY"; then
1.10833 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5
1.10834 +$as_echo "$OBJCOPY" >&6; }
1.10835 +else
1.10836 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.10837 +$as_echo "no" >&6; }
1.10838 +fi
1.10839 +
1.10840 +
1.10841 + test -n "$OBJCOPY" && break
1.10842 + done
1.10843 +fi
1.10844 +if test -z "$OBJCOPY"; then
1.10845 + ac_ct_OBJCOPY=$OBJCOPY
1.10846 + for ac_prog in gobjcopy objcopy
1.10847 +do
1.10848 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.10849 +set dummy $ac_prog; ac_word=$2
1.10850 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.10851 +$as_echo_n "checking for $ac_word... " >&6; }
1.10852 +if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
1.10853 + $as_echo_n "(cached) " >&6
1.10854 +else
1.10855 + if test -n "$ac_ct_OBJCOPY"; then
1.10856 + ac_cv_prog_ac_ct_OBJCOPY="$ac_ct_OBJCOPY" # Let the user override the test.
1.10857 +else
1.10858 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.10859 +for as_dir in $PATH
1.10860 +do
1.10861 + IFS=$as_save_IFS
1.10862 + test -z "$as_dir" && as_dir=.
1.10863 + for ac_exec_ext in '' $ac_executable_extensions; do
1.10864 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.10865 + ac_cv_prog_ac_ct_OBJCOPY="$ac_prog"
1.10866 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.10867 + break 2
1.10868 + fi
1.10869 +done
1.10870 + done
1.10871 +IFS=$as_save_IFS
1.10872 +
1.10873 +fi
1.10874 +fi
1.10875 +ac_ct_OBJCOPY=$ac_cv_prog_ac_ct_OBJCOPY
1.10876 +if test -n "$ac_ct_OBJCOPY"; then
1.10877 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJCOPY" >&5
1.10878 +$as_echo "$ac_ct_OBJCOPY" >&6; }
1.10879 +else
1.10880 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.10881 +$as_echo "no" >&6; }
1.10882 +fi
1.10883 +
1.10884 +
1.10885 + test -n "$ac_ct_OBJCOPY" && break
1.10886 +done
1.10887 +
1.10888 + if test "x$ac_ct_OBJCOPY" = x; then
1.10889 + OBJCOPY=""
1.10890 + else
1.10891 + case $cross_compiling:$ac_tool_warned in
1.10892 +yes:)
1.10893 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.10894 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.10895 +ac_tool_warned=yes ;;
1.10896 +esac
1.10897 + OBJCOPY=$ac_ct_OBJCOPY
1.10898 + fi
1.10899 +fi
1.10900 +
1.10901 + else
1.10902 + # The variable is set, but is it from the command line or the environment?
1.10903 +
1.10904 + # Try to remove the string !OBJCOPY! from our list.
1.10905 + try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!OBJCOPY!/}
1.10906 + if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.10907 + # If it failed, the variable was not from the command line. Ignore it,
1.10908 + # but warn the user (except for BASH, which is always set by the calling BASH).
1.10909 + if test "xOBJCOPY" != xBASH; then
1.10910 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of OBJCOPY from the environment. Use command line variables instead." >&5
1.10911 +$as_echo "$as_me: WARNING: Ignoring value of OBJCOPY from the environment. Use command line variables instead." >&2;}
1.10912 + fi
1.10913 + # Try to locate tool using the code snippet
1.10914 + if test -n "$ac_tool_prefix"; then
1.10915 + for ac_prog in gobjcopy objcopy
1.10916 + do
1.10917 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.10918 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.10919 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.10920 +$as_echo_n "checking for $ac_word... " >&6; }
1.10921 +if ${ac_cv_prog_OBJCOPY+:} false; then :
1.10922 + $as_echo_n "(cached) " >&6
1.10923 +else
1.10924 + if test -n "$OBJCOPY"; then
1.10925 + ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
1.10926 +else
1.10927 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.10928 +for as_dir in $PATH
1.10929 +do
1.10930 + IFS=$as_save_IFS
1.10931 + test -z "$as_dir" && as_dir=.
1.10932 + for ac_exec_ext in '' $ac_executable_extensions; do
1.10933 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.10934 + ac_cv_prog_OBJCOPY="$ac_tool_prefix$ac_prog"
1.10935 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.10936 + break 2
1.10937 + fi
1.10938 +done
1.10939 + done
1.10940 +IFS=$as_save_IFS
1.10941 +
1.10942 +fi
1.10943 +fi
1.10944 +OBJCOPY=$ac_cv_prog_OBJCOPY
1.10945 +if test -n "$OBJCOPY"; then
1.10946 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5
1.10947 +$as_echo "$OBJCOPY" >&6; }
1.10948 +else
1.10949 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.10950 +$as_echo "no" >&6; }
1.10951 +fi
1.10952 +
1.10953 +
1.10954 + test -n "$OBJCOPY" && break
1.10955 + done
1.10956 +fi
1.10957 +if test -z "$OBJCOPY"; then
1.10958 + ac_ct_OBJCOPY=$OBJCOPY
1.10959 + for ac_prog in gobjcopy objcopy
1.10960 +do
1.10961 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.10962 +set dummy $ac_prog; ac_word=$2
1.10963 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.10964 +$as_echo_n "checking for $ac_word... " >&6; }
1.10965 +if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
1.10966 + $as_echo_n "(cached) " >&6
1.10967 +else
1.10968 + if test -n "$ac_ct_OBJCOPY"; then
1.10969 + ac_cv_prog_ac_ct_OBJCOPY="$ac_ct_OBJCOPY" # Let the user override the test.
1.10970 +else
1.10971 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.10972 +for as_dir in $PATH
1.10973 +do
1.10974 + IFS=$as_save_IFS
1.10975 + test -z "$as_dir" && as_dir=.
1.10976 + for ac_exec_ext in '' $ac_executable_extensions; do
1.10977 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.10978 + ac_cv_prog_ac_ct_OBJCOPY="$ac_prog"
1.10979 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.10980 + break 2
1.10981 + fi
1.10982 +done
1.10983 + done
1.10984 +IFS=$as_save_IFS
1.10985 +
1.10986 +fi
1.10987 +fi
1.10988 +ac_ct_OBJCOPY=$ac_cv_prog_ac_ct_OBJCOPY
1.10989 +if test -n "$ac_ct_OBJCOPY"; then
1.10990 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJCOPY" >&5
1.10991 +$as_echo "$ac_ct_OBJCOPY" >&6; }
1.10992 +else
1.10993 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.10994 +$as_echo "no" >&6; }
1.10995 +fi
1.10996 +
1.10997 +
1.10998 + test -n "$ac_ct_OBJCOPY" && break
1.10999 +done
1.11000 +
1.11001 + if test "x$ac_ct_OBJCOPY" = x; then
1.11002 + OBJCOPY=""
1.11003 + else
1.11004 + case $cross_compiling:$ac_tool_warned in
1.11005 +yes:)
1.11006 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.11007 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.11008 +ac_tool_warned=yes ;;
1.11009 +esac
1.11010 + OBJCOPY=$ac_ct_OBJCOPY
1.11011 + fi
1.11012 +fi
1.11013 +
1.11014 + else
1.11015 + # If it succeeded, then it was overridden by the user. We will use it
1.11016 + # for the tool.
1.11017 +
1.11018 + # First remove it from the list of overridden variables, so we can test
1.11019 + # for unknown variables in the end.
1.11020 + CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.11021 +
1.11022 + # Check if the provided tool contains a complete path.
1.11023 + tool_specified="$OBJCOPY"
1.11024 + tool_basename="${tool_specified##*/}"
1.11025 + if test "x$tool_basename" = "x$tool_specified"; then
1.11026 + # A command without a complete path is provided, search $PATH.
1.11027 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool OBJCOPY=$tool_basename" >&5
1.11028 +$as_echo "$as_me: Will search for user supplied tool OBJCOPY=$tool_basename" >&6;}
1.11029 + # Extract the first word of "$tool_basename", so it can be a program name with args.
1.11030 +set dummy $tool_basename; ac_word=$2
1.11031 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.11032 +$as_echo_n "checking for $ac_word... " >&6; }
1.11033 +if ${ac_cv_path_OBJCOPY+:} false; then :
1.11034 + $as_echo_n "(cached) " >&6
1.11035 +else
1.11036 + case $OBJCOPY in
1.11037 + [\\/]* | ?:[\\/]*)
1.11038 + ac_cv_path_OBJCOPY="$OBJCOPY" # Let the user override the test with a path.
1.11039 + ;;
1.11040 + *)
1.11041 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.11042 +for as_dir in $PATH
1.11043 +do
1.11044 + IFS=$as_save_IFS
1.11045 + test -z "$as_dir" && as_dir=.
1.11046 + for ac_exec_ext in '' $ac_executable_extensions; do
1.11047 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.11048 + ac_cv_path_OBJCOPY="$as_dir/$ac_word$ac_exec_ext"
1.11049 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.11050 + break 2
1.11051 + fi
1.11052 +done
1.11053 + done
1.11054 +IFS=$as_save_IFS
1.11055 +
1.11056 + ;;
1.11057 +esac
1.11058 +fi
1.11059 +OBJCOPY=$ac_cv_path_OBJCOPY
1.11060 +if test -n "$OBJCOPY"; then
1.11061 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5
1.11062 +$as_echo "$OBJCOPY" >&6; }
1.11063 +else
1.11064 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.11065 +$as_echo "no" >&6; }
1.11066 +fi
1.11067 +
1.11068 +
1.11069 + if test "x$OBJCOPY" = x; then
1.11070 + as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.11071 + fi
1.11072 + else
1.11073 + # Otherwise we believe it is a complete path. Use it as it is.
1.11074 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool OBJCOPY=$tool_specified" >&5
1.11075 +$as_echo "$as_me: Will use user supplied tool OBJCOPY=$tool_specified" >&6;}
1.11076 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OBJCOPY" >&5
1.11077 +$as_echo_n "checking for OBJCOPY... " >&6; }
1.11078 + if test ! -x "$tool_specified"; then
1.11079 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.11080 +$as_echo "not found" >&6; }
1.11081 + as_fn_error $? "User supplied tool OBJCOPY=$tool_specified does not exist or is not executable" "$LINENO" 5
1.11082 + fi
1.11083 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.11084 +$as_echo "$tool_specified" >&6; }
1.11085 + fi
1.11086 + fi
1.11087 + fi
1.11088 +
1.11089 +
1.11090 + # Only call fixup if objcopy was found.
1.11091 + if test -n "$OBJCOPY"; then
1.11092 +
1.11093 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.11094 +
1.11095 + # First separate the path from the arguments. This will split at the first
1.11096 + # space.
1.11097 + complete="$OBJCOPY"
1.11098 path="${complete%% *}"
1.11099 tmp="$complete EOL"
1.11100 arguments="${tmp#* }"
1.11101 @@ -35627,14 +36603,14 @@
1.11102 fi
1.11103 if test "x$new_path" = x; then
1.11104 # It's still not found. Now this is an unrecoverable error.
1.11105 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of GNM, which resolves as \"$complete\", is not found." >&5
1.11106 -$as_echo "$as_me: The path of GNM, which resolves as \"$complete\", is not found." >&6;}
1.11107 - has_space=`$ECHO "$complete" | $GREP " "`
1.11108 - if test "x$has_space" != x; then
1.11109 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.11110 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.11111 - fi
1.11112 - as_fn_error $? "Cannot locate the the path of GNM" "$LINENO" 5
1.11113 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&5
1.11114 +$as_echo "$as_me: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&6;}
1.11115 + has_space=`$ECHO "$complete" | $GREP " "`
1.11116 + if test "x$has_space" != x; then
1.11117 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.11118 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.11119 + fi
1.11120 + as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5
1.11121 fi
1.11122 fi
1.11123
1.11124 @@ -35654,11 +36630,11 @@
1.11125 elif test -f "${new_path}.cmd"; then
1.11126 input_to_shortpath="${new_path}.cmd"
1.11127 else
1.11128 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of GNM, which resolves as \"$new_path\", is invalid." >&5
1.11129 -$as_echo "$as_me: The path of GNM, which resolves as \"$new_path\", is invalid." >&6;}
1.11130 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$new_path\", is invalid." >&5
1.11131 +$as_echo "$as_me: The path of OBJCOPY, which resolves as \"$new_path\", is invalid." >&6;}
1.11132 { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.11133 $as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.11134 - as_fn_error $? "Cannot locate the the path of GNM" "$LINENO" 5
1.11135 + as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5
1.11136 fi
1.11137 else
1.11138 input_to_shortpath="$new_path"
1.11139 @@ -35705,7 +36681,7 @@
1.11140
1.11141 # First separate the path from the arguments. This will split at the first
1.11142 # space.
1.11143 - complete="$GNM"
1.11144 + complete="$OBJCOPY"
1.11145 path="${complete%% *}"
1.11146 tmp="$complete EOL"
1.11147 arguments="${tmp#* }"
1.11148 @@ -35750,14 +36726,14 @@
1.11149
1.11150 if test "x$new_path" = x; then
1.11151 # It's still not found. Now this is an unrecoverable error.
1.11152 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of GNM, which resolves as \"$complete\", is not found." >&5
1.11153 -$as_echo "$as_me: The path of GNM, which resolves as \"$complete\", is not found." >&6;}
1.11154 - has_space=`$ECHO "$complete" | $GREP " "`
1.11155 - if test "x$has_space" != x; then
1.11156 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.11157 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.11158 - fi
1.11159 - as_fn_error $? "Cannot locate the the path of GNM" "$LINENO" 5
1.11160 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&5
1.11161 +$as_echo "$as_me: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&6;}
1.11162 + has_space=`$ECHO "$complete" | $GREP " "`
1.11163 + if test "x$has_space" != x; then
1.11164 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.11165 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.11166 + fi
1.11167 + as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5
1.11168 fi
1.11169 fi
1.11170
1.11171 @@ -35803,7 +36779,7 @@
1.11172 # We're on a posix platform. Hooray! :)
1.11173 # First separate the path from the arguments. This will split at the first
1.11174 # space.
1.11175 - complete="$GNM"
1.11176 + complete="$OBJCOPY"
1.11177 path="${complete%% *}"
1.11178 tmp="$complete EOL"
1.11179 arguments="${tmp#* }"
1.11180 @@ -35822,20 +36798,19 @@
1.11181 done
1.11182 IFS="$IFS_save"
1.11183 else
1.11184 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving GNM (as $path) failed, using $path directly." >&5
1.11185 -$as_echo "$as_me: Resolving GNM (as $path) failed, using $path directly." >&6;}
1.11186 + # This is an absolute path, we can use it without further modifications.
1.11187 new_path="$path"
1.11188 fi
1.11189
1.11190 if test "x$new_path" = x; then
1.11191 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of GNM, which resolves as \"$complete\", is not found." >&5
1.11192 -$as_echo "$as_me: The path of GNM, which resolves as \"$complete\", is not found." >&6;}
1.11193 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&5
1.11194 +$as_echo "$as_me: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&6;}
1.11195 has_space=`$ECHO "$complete" | $GREP " "`
1.11196 if test "x$has_space" != x; then
1.11197 { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.11198 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.11199 fi
1.11200 - as_fn_error $? "Cannot locate the the path of GNM" "$LINENO" 5
1.11201 + as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5
1.11202 fi
1.11203 fi
1.11204
1.11205 @@ -35847,203 +36822,319 @@
1.11206 fi
1.11207
1.11208 if test "x$complete" != "x$new_complete"; then
1.11209 - GNM="$new_complete"
1.11210 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting GNM to \"$new_complete\"" >&5
1.11211 -$as_echo "$as_me: Rewriting GNM to \"$new_complete\"" >&6;}
1.11212 - fi
1.11213 -
1.11214 -
1.11215 -
1.11216 - # Publish this variable in the help.
1.11217 -
1.11218 -
1.11219 - if test "x$STRIP" = x; then
1.11220 - # The variable is not set by user, try to locate tool using the code snippet
1.11221 - for ac_prog in strip
1.11222 -do
1.11223 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.11224 -set dummy $ac_prog; ac_word=$2
1.11225 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.11226 -$as_echo_n "checking for $ac_word... " >&6; }
1.11227 -if ${ac_cv_path_STRIP+:} false; then :
1.11228 - $as_echo_n "(cached) " >&6
1.11229 -else
1.11230 - case $STRIP in
1.11231 - [\\/]* | ?:[\\/]*)
1.11232 - ac_cv_path_STRIP="$STRIP" # Let the user override the test with a path.
1.11233 - ;;
1.11234 - *)
1.11235 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.11236 -for as_dir in $PATH
1.11237 -do
1.11238 - IFS=$as_save_IFS
1.11239 - test -z "$as_dir" && as_dir=.
1.11240 - for ac_exec_ext in '' $ac_executable_extensions; do
1.11241 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.11242 - ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext"
1.11243 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.11244 - break 2
1.11245 - fi
1.11246 -done
1.11247 - done
1.11248 -IFS=$as_save_IFS
1.11249 -
1.11250 - ;;
1.11251 -esac
1.11252 -fi
1.11253 -STRIP=$ac_cv_path_STRIP
1.11254 -if test -n "$STRIP"; then
1.11255 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
1.11256 -$as_echo "$STRIP" >&6; }
1.11257 -else
1.11258 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.11259 -$as_echo "no" >&6; }
1.11260 -fi
1.11261 -
1.11262 -
1.11263 - test -n "$STRIP" && break
1.11264 -done
1.11265 -
1.11266 - else
1.11267 - # The variable is set, but is it from the command line or the environment?
1.11268 -
1.11269 - # Try to remove the string !STRIP! from our list.
1.11270 - try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!STRIP!/}
1.11271 - if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.11272 - # If it failed, the variable was not from the command line. Ignore it,
1.11273 - # but warn the user (except for BASH, which is always set by the calling BASH).
1.11274 - if test "xSTRIP" != xBASH; then
1.11275 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of STRIP from the environment. Use command line variables instead." >&5
1.11276 -$as_echo "$as_me: WARNING: Ignoring value of STRIP from the environment. Use command line variables instead." >&2;}
1.11277 - fi
1.11278 - # Try to locate tool using the code snippet
1.11279 - for ac_prog in strip
1.11280 -do
1.11281 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.11282 -set dummy $ac_prog; ac_word=$2
1.11283 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.11284 -$as_echo_n "checking for $ac_word... " >&6; }
1.11285 -if ${ac_cv_path_STRIP+:} false; then :
1.11286 - $as_echo_n "(cached) " >&6
1.11287 -else
1.11288 - case $STRIP in
1.11289 - [\\/]* | ?:[\\/]*)
1.11290 - ac_cv_path_STRIP="$STRIP" # Let the user override the test with a path.
1.11291 - ;;
1.11292 - *)
1.11293 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.11294 -for as_dir in $PATH
1.11295 -do
1.11296 - IFS=$as_save_IFS
1.11297 - test -z "$as_dir" && as_dir=.
1.11298 - for ac_exec_ext in '' $ac_executable_extensions; do
1.11299 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.11300 - ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext"
1.11301 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.11302 - break 2
1.11303 - fi
1.11304 -done
1.11305 - done
1.11306 -IFS=$as_save_IFS
1.11307 -
1.11308 - ;;
1.11309 -esac
1.11310 -fi
1.11311 -STRIP=$ac_cv_path_STRIP
1.11312 -if test -n "$STRIP"; then
1.11313 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
1.11314 -$as_echo "$STRIP" >&6; }
1.11315 -else
1.11316 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.11317 -$as_echo "no" >&6; }
1.11318 -fi
1.11319 -
1.11320 -
1.11321 - test -n "$STRIP" && break
1.11322 -done
1.11323 -
1.11324 - else
1.11325 - # If it succeeded, then it was overridden by the user. We will use it
1.11326 - # for the tool.
1.11327 -
1.11328 - # First remove it from the list of overridden variables, so we can test
1.11329 - # for unknown variables in the end.
1.11330 - CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.11331 -
1.11332 - # Check if the provided tool contains a complete path.
1.11333 - tool_specified="$STRIP"
1.11334 - tool_basename="${tool_specified##*/}"
1.11335 - if test "x$tool_basename" = "x$tool_specified"; then
1.11336 - # A command without a complete path is provided, search $PATH.
1.11337 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool STRIP=$tool_basename" >&5
1.11338 -$as_echo "$as_me: Will search for user supplied tool STRIP=$tool_basename" >&6;}
1.11339 - # Extract the first word of "$tool_basename", so it can be a program name with args.
1.11340 -set dummy $tool_basename; ac_word=$2
1.11341 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.11342 -$as_echo_n "checking for $ac_word... " >&6; }
1.11343 -if ${ac_cv_path_STRIP+:} false; then :
1.11344 - $as_echo_n "(cached) " >&6
1.11345 -else
1.11346 - case $STRIP in
1.11347 - [\\/]* | ?:[\\/]*)
1.11348 - ac_cv_path_STRIP="$STRIP" # Let the user override the test with a path.
1.11349 - ;;
1.11350 - *)
1.11351 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.11352 -for as_dir in $PATH
1.11353 -do
1.11354 - IFS=$as_save_IFS
1.11355 - test -z "$as_dir" && as_dir=.
1.11356 - for ac_exec_ext in '' $ac_executable_extensions; do
1.11357 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.11358 - ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext"
1.11359 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.11360 - break 2
1.11361 - fi
1.11362 -done
1.11363 - done
1.11364 -IFS=$as_save_IFS
1.11365 -
1.11366 - ;;
1.11367 -esac
1.11368 -fi
1.11369 -STRIP=$ac_cv_path_STRIP
1.11370 -if test -n "$STRIP"; then
1.11371 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
1.11372 -$as_echo "$STRIP" >&6; }
1.11373 -else
1.11374 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.11375 -$as_echo "no" >&6; }
1.11376 -fi
1.11377 -
1.11378 -
1.11379 - if test "x$STRIP" = x; then
1.11380 - as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.11381 - fi
1.11382 - else
1.11383 - # Otherwise we believe it is a complete path. Use it as it is.
1.11384 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool STRIP=$tool_specified" >&5
1.11385 -$as_echo "$as_me: Will use user supplied tool STRIP=$tool_specified" >&6;}
1.11386 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for STRIP" >&5
1.11387 -$as_echo_n "checking for STRIP... " >&6; }
1.11388 - if test ! -x "$tool_specified"; then
1.11389 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.11390 -$as_echo "not found" >&6; }
1.11391 - as_fn_error $? "User supplied tool STRIP=$tool_specified does not exist or is not executable" "$LINENO" 5
1.11392 - fi
1.11393 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.11394 -$as_echo "$tool_specified" >&6; }
1.11395 - fi
1.11396 - fi
1.11397 - fi
1.11398 -
1.11399 -
1.11400 -
1.11401 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.11402 -
1.11403 - # First separate the path from the arguments. This will split at the first
1.11404 - # space.
1.11405 - complete="$STRIP"
1.11406 + OBJCOPY="$new_complete"
1.11407 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJCOPY to \"$new_complete\"" >&5
1.11408 +$as_echo "$as_me: Rewriting OBJCOPY to \"$new_complete\"" >&6;}
1.11409 + fi
1.11410 +
1.11411 + fi
1.11412 + fi
1.11413 +
1.11414 +
1.11415 +
1.11416 + # Publish this variable in the help.
1.11417 +
1.11418 +
1.11419 + if test "x$OBJDUMP" = x; then
1.11420 + # The variable is not set by user, try to locate tool using the code snippet
1.11421 + if test -n "$ac_tool_prefix"; then
1.11422 + for ac_prog in gobjdump objdump
1.11423 + do
1.11424 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.11425 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.11426 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.11427 +$as_echo_n "checking for $ac_word... " >&6; }
1.11428 +if ${ac_cv_prog_OBJDUMP+:} false; then :
1.11429 + $as_echo_n "(cached) " >&6
1.11430 +else
1.11431 + if test -n "$OBJDUMP"; then
1.11432 + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
1.11433 +else
1.11434 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.11435 +for as_dir in $PATH
1.11436 +do
1.11437 + IFS=$as_save_IFS
1.11438 + test -z "$as_dir" && as_dir=.
1.11439 + for ac_exec_ext in '' $ac_executable_extensions; do
1.11440 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.11441 + ac_cv_prog_OBJDUMP="$ac_tool_prefix$ac_prog"
1.11442 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.11443 + break 2
1.11444 + fi
1.11445 +done
1.11446 + done
1.11447 +IFS=$as_save_IFS
1.11448 +
1.11449 +fi
1.11450 +fi
1.11451 +OBJDUMP=$ac_cv_prog_OBJDUMP
1.11452 +if test -n "$OBJDUMP"; then
1.11453 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
1.11454 +$as_echo "$OBJDUMP" >&6; }
1.11455 +else
1.11456 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.11457 +$as_echo "no" >&6; }
1.11458 +fi
1.11459 +
1.11460 +
1.11461 + test -n "$OBJDUMP" && break
1.11462 + done
1.11463 +fi
1.11464 +if test -z "$OBJDUMP"; then
1.11465 + ac_ct_OBJDUMP=$OBJDUMP
1.11466 + for ac_prog in gobjdump objdump
1.11467 +do
1.11468 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.11469 +set dummy $ac_prog; ac_word=$2
1.11470 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.11471 +$as_echo_n "checking for $ac_word... " >&6; }
1.11472 +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
1.11473 + $as_echo_n "(cached) " >&6
1.11474 +else
1.11475 + if test -n "$ac_ct_OBJDUMP"; then
1.11476 + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
1.11477 +else
1.11478 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.11479 +for as_dir in $PATH
1.11480 +do
1.11481 + IFS=$as_save_IFS
1.11482 + test -z "$as_dir" && as_dir=.
1.11483 + for ac_exec_ext in '' $ac_executable_extensions; do
1.11484 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.11485 + ac_cv_prog_ac_ct_OBJDUMP="$ac_prog"
1.11486 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.11487 + break 2
1.11488 + fi
1.11489 +done
1.11490 + done
1.11491 +IFS=$as_save_IFS
1.11492 +
1.11493 +fi
1.11494 +fi
1.11495 +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
1.11496 +if test -n "$ac_ct_OBJDUMP"; then
1.11497 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
1.11498 +$as_echo "$ac_ct_OBJDUMP" >&6; }
1.11499 +else
1.11500 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.11501 +$as_echo "no" >&6; }
1.11502 +fi
1.11503 +
1.11504 +
1.11505 + test -n "$ac_ct_OBJDUMP" && break
1.11506 +done
1.11507 +
1.11508 + if test "x$ac_ct_OBJDUMP" = x; then
1.11509 + OBJDUMP=""
1.11510 + else
1.11511 + case $cross_compiling:$ac_tool_warned in
1.11512 +yes:)
1.11513 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.11514 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.11515 +ac_tool_warned=yes ;;
1.11516 +esac
1.11517 + OBJDUMP=$ac_ct_OBJDUMP
1.11518 + fi
1.11519 +fi
1.11520 +
1.11521 + else
1.11522 + # The variable is set, but is it from the command line or the environment?
1.11523 +
1.11524 + # Try to remove the string !OBJDUMP! from our list.
1.11525 + try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!OBJDUMP!/}
1.11526 + if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.11527 + # If it failed, the variable was not from the command line. Ignore it,
1.11528 + # but warn the user (except for BASH, which is always set by the calling BASH).
1.11529 + if test "xOBJDUMP" != xBASH; then
1.11530 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of OBJDUMP from the environment. Use command line variables instead." >&5
1.11531 +$as_echo "$as_me: WARNING: Ignoring value of OBJDUMP from the environment. Use command line variables instead." >&2;}
1.11532 + fi
1.11533 + # Try to locate tool using the code snippet
1.11534 + if test -n "$ac_tool_prefix"; then
1.11535 + for ac_prog in gobjdump objdump
1.11536 + do
1.11537 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.11538 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.11539 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.11540 +$as_echo_n "checking for $ac_word... " >&6; }
1.11541 +if ${ac_cv_prog_OBJDUMP+:} false; then :
1.11542 + $as_echo_n "(cached) " >&6
1.11543 +else
1.11544 + if test -n "$OBJDUMP"; then
1.11545 + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
1.11546 +else
1.11547 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.11548 +for as_dir in $PATH
1.11549 +do
1.11550 + IFS=$as_save_IFS
1.11551 + test -z "$as_dir" && as_dir=.
1.11552 + for ac_exec_ext in '' $ac_executable_extensions; do
1.11553 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.11554 + ac_cv_prog_OBJDUMP="$ac_tool_prefix$ac_prog"
1.11555 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.11556 + break 2
1.11557 + fi
1.11558 +done
1.11559 + done
1.11560 +IFS=$as_save_IFS
1.11561 +
1.11562 +fi
1.11563 +fi
1.11564 +OBJDUMP=$ac_cv_prog_OBJDUMP
1.11565 +if test -n "$OBJDUMP"; then
1.11566 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
1.11567 +$as_echo "$OBJDUMP" >&6; }
1.11568 +else
1.11569 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.11570 +$as_echo "no" >&6; }
1.11571 +fi
1.11572 +
1.11573 +
1.11574 + test -n "$OBJDUMP" && break
1.11575 + done
1.11576 +fi
1.11577 +if test -z "$OBJDUMP"; then
1.11578 + ac_ct_OBJDUMP=$OBJDUMP
1.11579 + for ac_prog in gobjdump objdump
1.11580 +do
1.11581 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.11582 +set dummy $ac_prog; ac_word=$2
1.11583 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.11584 +$as_echo_n "checking for $ac_word... " >&6; }
1.11585 +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
1.11586 + $as_echo_n "(cached) " >&6
1.11587 +else
1.11588 + if test -n "$ac_ct_OBJDUMP"; then
1.11589 + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
1.11590 +else
1.11591 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.11592 +for as_dir in $PATH
1.11593 +do
1.11594 + IFS=$as_save_IFS
1.11595 + test -z "$as_dir" && as_dir=.
1.11596 + for ac_exec_ext in '' $ac_executable_extensions; do
1.11597 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.11598 + ac_cv_prog_ac_ct_OBJDUMP="$ac_prog"
1.11599 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.11600 + break 2
1.11601 + fi
1.11602 +done
1.11603 + done
1.11604 +IFS=$as_save_IFS
1.11605 +
1.11606 +fi
1.11607 +fi
1.11608 +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
1.11609 +if test -n "$ac_ct_OBJDUMP"; then
1.11610 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
1.11611 +$as_echo "$ac_ct_OBJDUMP" >&6; }
1.11612 +else
1.11613 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.11614 +$as_echo "no" >&6; }
1.11615 +fi
1.11616 +
1.11617 +
1.11618 + test -n "$ac_ct_OBJDUMP" && break
1.11619 +done
1.11620 +
1.11621 + if test "x$ac_ct_OBJDUMP" = x; then
1.11622 + OBJDUMP=""
1.11623 + else
1.11624 + case $cross_compiling:$ac_tool_warned in
1.11625 +yes:)
1.11626 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.11627 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.11628 +ac_tool_warned=yes ;;
1.11629 +esac
1.11630 + OBJDUMP=$ac_ct_OBJDUMP
1.11631 + fi
1.11632 +fi
1.11633 +
1.11634 + else
1.11635 + # If it succeeded, then it was overridden by the user. We will use it
1.11636 + # for the tool.
1.11637 +
1.11638 + # First remove it from the list of overridden variables, so we can test
1.11639 + # for unknown variables in the end.
1.11640 + CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.11641 +
1.11642 + # Check if the provided tool contains a complete path.
1.11643 + tool_specified="$OBJDUMP"
1.11644 + tool_basename="${tool_specified##*/}"
1.11645 + if test "x$tool_basename" = "x$tool_specified"; then
1.11646 + # A command without a complete path is provided, search $PATH.
1.11647 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool OBJDUMP=$tool_basename" >&5
1.11648 +$as_echo "$as_me: Will search for user supplied tool OBJDUMP=$tool_basename" >&6;}
1.11649 + # Extract the first word of "$tool_basename", so it can be a program name with args.
1.11650 +set dummy $tool_basename; ac_word=$2
1.11651 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.11652 +$as_echo_n "checking for $ac_word... " >&6; }
1.11653 +if ${ac_cv_path_OBJDUMP+:} false; then :
1.11654 + $as_echo_n "(cached) " >&6
1.11655 +else
1.11656 + case $OBJDUMP in
1.11657 + [\\/]* | ?:[\\/]*)
1.11658 + ac_cv_path_OBJDUMP="$OBJDUMP" # Let the user override the test with a path.
1.11659 + ;;
1.11660 + *)
1.11661 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.11662 +for as_dir in $PATH
1.11663 +do
1.11664 + IFS=$as_save_IFS
1.11665 + test -z "$as_dir" && as_dir=.
1.11666 + for ac_exec_ext in '' $ac_executable_extensions; do
1.11667 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.11668 + ac_cv_path_OBJDUMP="$as_dir/$ac_word$ac_exec_ext"
1.11669 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.11670 + break 2
1.11671 + fi
1.11672 +done
1.11673 + done
1.11674 +IFS=$as_save_IFS
1.11675 +
1.11676 + ;;
1.11677 +esac
1.11678 +fi
1.11679 +OBJDUMP=$ac_cv_path_OBJDUMP
1.11680 +if test -n "$OBJDUMP"; then
1.11681 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
1.11682 +$as_echo "$OBJDUMP" >&6; }
1.11683 +else
1.11684 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.11685 +$as_echo "no" >&6; }
1.11686 +fi
1.11687 +
1.11688 +
1.11689 + if test "x$OBJDUMP" = x; then
1.11690 + as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.11691 + fi
1.11692 + else
1.11693 + # Otherwise we believe it is a complete path. Use it as it is.
1.11694 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool OBJDUMP=$tool_specified" >&5
1.11695 +$as_echo "$as_me: Will use user supplied tool OBJDUMP=$tool_specified" >&6;}
1.11696 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OBJDUMP" >&5
1.11697 +$as_echo_n "checking for OBJDUMP... " >&6; }
1.11698 + if test ! -x "$tool_specified"; then
1.11699 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.11700 +$as_echo "not found" >&6; }
1.11701 + as_fn_error $? "User supplied tool OBJDUMP=$tool_specified does not exist or is not executable" "$LINENO" 5
1.11702 + fi
1.11703 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.11704 +$as_echo "$tool_specified" >&6; }
1.11705 + fi
1.11706 + fi
1.11707 + fi
1.11708 +
1.11709 +
1.11710 + if test "x$OBJDUMP" != x; then
1.11711 + # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE
1.11712 + # bails if argument is missing.
1.11713 +
1.11714 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.11715 +
1.11716 + # First separate the path from the arguments. This will split at the first
1.11717 + # space.
1.11718 + complete="$OBJDUMP"
1.11719 path="${complete%% *}"
1.11720 tmp="$complete EOL"
1.11721 arguments="${tmp#* }"
1.11722 @@ -36079,14 +37170,14 @@
1.11723 fi
1.11724 if test "x$new_path" = x; then
1.11725 # It's still not found. Now this is an unrecoverable error.
1.11726 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
1.11727 -$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
1.11728 - has_space=`$ECHO "$complete" | $GREP " "`
1.11729 - if test "x$has_space" != x; then
1.11730 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.11731 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.11732 - fi
1.11733 - as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.11734 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&5
1.11735 +$as_echo "$as_me: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&6;}
1.11736 + has_space=`$ECHO "$complete" | $GREP " "`
1.11737 + if test "x$has_space" != x; then
1.11738 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.11739 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.11740 + fi
1.11741 + as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5
1.11742 fi
1.11743 fi
1.11744
1.11745 @@ -36106,11 +37197,11 @@
1.11746 elif test -f "${new_path}.cmd"; then
1.11747 input_to_shortpath="${new_path}.cmd"
1.11748 else
1.11749 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$new_path\", is invalid." >&5
1.11750 -$as_echo "$as_me: The path of STRIP, which resolves as \"$new_path\", is invalid." >&6;}
1.11751 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$new_path\", is invalid." >&5
1.11752 +$as_echo "$as_me: The path of OBJDUMP, which resolves as \"$new_path\", is invalid." >&6;}
1.11753 { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.11754 $as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.11755 - as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.11756 + as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5
1.11757 fi
1.11758 else
1.11759 input_to_shortpath="$new_path"
1.11760 @@ -36157,7 +37248,7 @@
1.11761
1.11762 # First separate the path from the arguments. This will split at the first
1.11763 # space.
1.11764 - complete="$STRIP"
1.11765 + complete="$OBJDUMP"
1.11766 path="${complete%% *}"
1.11767 tmp="$complete EOL"
1.11768 arguments="${tmp#* }"
1.11769 @@ -36202,14 +37293,14 @@
1.11770
1.11771 if test "x$new_path" = x; then
1.11772 # It's still not found. Now this is an unrecoverable error.
1.11773 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
1.11774 -$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
1.11775 - has_space=`$ECHO "$complete" | $GREP " "`
1.11776 - if test "x$has_space" != x; then
1.11777 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.11778 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.11779 - fi
1.11780 - as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.11781 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&5
1.11782 +$as_echo "$as_me: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&6;}
1.11783 + has_space=`$ECHO "$complete" | $GREP " "`
1.11784 + if test "x$has_space" != x; then
1.11785 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.11786 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.11787 + fi
1.11788 + as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5
1.11789 fi
1.11790 fi
1.11791
1.11792 @@ -36255,7 +37346,7 @@
1.11793 # We're on a posix platform. Hooray! :)
1.11794 # First separate the path from the arguments. This will split at the first
1.11795 # space.
1.11796 - complete="$STRIP"
1.11797 + complete="$OBJDUMP"
1.11798 path="${complete%% *}"
1.11799 tmp="$complete EOL"
1.11800 arguments="${tmp#* }"
1.11801 @@ -36274,20 +37365,19 @@
1.11802 done
1.11803 IFS="$IFS_save"
1.11804 else
1.11805 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving STRIP (as $path) failed, using $path directly." >&5
1.11806 -$as_echo "$as_me: Resolving STRIP (as $path) failed, using $path directly." >&6;}
1.11807 + # This is an absolute path, we can use it without further modifications.
1.11808 new_path="$path"
1.11809 fi
1.11810
1.11811 if test "x$new_path" = x; then
1.11812 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
1.11813 -$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
1.11814 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&5
1.11815 +$as_echo "$as_me: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&6;}
1.11816 has_space=`$ECHO "$complete" | $GREP " "`
1.11817 if test "x$has_space" != x; then
1.11818 { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.11819 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.11820 fi
1.11821 - as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.11822 + as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5
1.11823 fi
1.11824 fi
1.11825
1.11826 @@ -36299,203 +37389,228 @@
1.11827 fi
1.11828
1.11829 if test "x$complete" != "x$new_complete"; then
1.11830 - STRIP="$new_complete"
1.11831 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5
1.11832 -$as_echo "$as_me: Rewriting STRIP to \"$new_complete\"" >&6;}
1.11833 - fi
1.11834 -
1.11835 -
1.11836 -
1.11837 - # Publish this variable in the help.
1.11838 -
1.11839 -
1.11840 - if test "x$MCS" = x; then
1.11841 - # The variable is not set by user, try to locate tool using the code snippet
1.11842 - for ac_prog in mcs
1.11843 -do
1.11844 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.11845 -set dummy $ac_prog; ac_word=$2
1.11846 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.11847 -$as_echo_n "checking for $ac_word... " >&6; }
1.11848 -if ${ac_cv_path_MCS+:} false; then :
1.11849 - $as_echo_n "(cached) " >&6
1.11850 -else
1.11851 - case $MCS in
1.11852 - [\\/]* | ?:[\\/]*)
1.11853 - ac_cv_path_MCS="$MCS" # Let the user override the test with a path.
1.11854 - ;;
1.11855 - *)
1.11856 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.11857 -for as_dir in $PATH
1.11858 -do
1.11859 - IFS=$as_save_IFS
1.11860 - test -z "$as_dir" && as_dir=.
1.11861 - for ac_exec_ext in '' $ac_executable_extensions; do
1.11862 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.11863 - ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
1.11864 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.11865 - break 2
1.11866 - fi
1.11867 -done
1.11868 - done
1.11869 -IFS=$as_save_IFS
1.11870 -
1.11871 - ;;
1.11872 -esac
1.11873 -fi
1.11874 -MCS=$ac_cv_path_MCS
1.11875 -if test -n "$MCS"; then
1.11876 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5
1.11877 -$as_echo "$MCS" >&6; }
1.11878 -else
1.11879 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.11880 -$as_echo "no" >&6; }
1.11881 -fi
1.11882 -
1.11883 -
1.11884 - test -n "$MCS" && break
1.11885 -done
1.11886 -
1.11887 - else
1.11888 - # The variable is set, but is it from the command line or the environment?
1.11889 -
1.11890 - # Try to remove the string !MCS! from our list.
1.11891 - try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!MCS!/}
1.11892 - if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.11893 - # If it failed, the variable was not from the command line. Ignore it,
1.11894 - # but warn the user (except for BASH, which is always set by the calling BASH).
1.11895 - if test "xMCS" != xBASH; then
1.11896 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of MCS from the environment. Use command line variables instead." >&5
1.11897 -$as_echo "$as_me: WARNING: Ignoring value of MCS from the environment. Use command line variables instead." >&2;}
1.11898 - fi
1.11899 - # Try to locate tool using the code snippet
1.11900 - for ac_prog in mcs
1.11901 -do
1.11902 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.11903 -set dummy $ac_prog; ac_word=$2
1.11904 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.11905 -$as_echo_n "checking for $ac_word... " >&6; }
1.11906 -if ${ac_cv_path_MCS+:} false; then :
1.11907 - $as_echo_n "(cached) " >&6
1.11908 -else
1.11909 - case $MCS in
1.11910 - [\\/]* | ?:[\\/]*)
1.11911 - ac_cv_path_MCS="$MCS" # Let the user override the test with a path.
1.11912 - ;;
1.11913 - *)
1.11914 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.11915 -for as_dir in $PATH
1.11916 -do
1.11917 - IFS=$as_save_IFS
1.11918 - test -z "$as_dir" && as_dir=.
1.11919 - for ac_exec_ext in '' $ac_executable_extensions; do
1.11920 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.11921 - ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
1.11922 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.11923 - break 2
1.11924 - fi
1.11925 -done
1.11926 - done
1.11927 -IFS=$as_save_IFS
1.11928 -
1.11929 - ;;
1.11930 -esac
1.11931 -fi
1.11932 -MCS=$ac_cv_path_MCS
1.11933 -if test -n "$MCS"; then
1.11934 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5
1.11935 -$as_echo "$MCS" >&6; }
1.11936 -else
1.11937 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.11938 -$as_echo "no" >&6; }
1.11939 -fi
1.11940 -
1.11941 -
1.11942 - test -n "$MCS" && break
1.11943 -done
1.11944 -
1.11945 - else
1.11946 - # If it succeeded, then it was overridden by the user. We will use it
1.11947 - # for the tool.
1.11948 -
1.11949 - # First remove it from the list of overridden variables, so we can test
1.11950 - # for unknown variables in the end.
1.11951 - CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.11952 -
1.11953 - # Check if the provided tool contains a complete path.
1.11954 - tool_specified="$MCS"
1.11955 - tool_basename="${tool_specified##*/}"
1.11956 - if test "x$tool_basename" = "x$tool_specified"; then
1.11957 - # A command without a complete path is provided, search $PATH.
1.11958 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool MCS=$tool_basename" >&5
1.11959 -$as_echo "$as_me: Will search for user supplied tool MCS=$tool_basename" >&6;}
1.11960 - # Extract the first word of "$tool_basename", so it can be a program name with args.
1.11961 -set dummy $tool_basename; ac_word=$2
1.11962 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.11963 -$as_echo_n "checking for $ac_word... " >&6; }
1.11964 -if ${ac_cv_path_MCS+:} false; then :
1.11965 - $as_echo_n "(cached) " >&6
1.11966 -else
1.11967 - case $MCS in
1.11968 - [\\/]* | ?:[\\/]*)
1.11969 - ac_cv_path_MCS="$MCS" # Let the user override the test with a path.
1.11970 - ;;
1.11971 - *)
1.11972 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.11973 -for as_dir in $PATH
1.11974 -do
1.11975 - IFS=$as_save_IFS
1.11976 - test -z "$as_dir" && as_dir=.
1.11977 - for ac_exec_ext in '' $ac_executable_extensions; do
1.11978 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.11979 - ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
1.11980 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.11981 - break 2
1.11982 - fi
1.11983 -done
1.11984 - done
1.11985 -IFS=$as_save_IFS
1.11986 -
1.11987 - ;;
1.11988 -esac
1.11989 -fi
1.11990 -MCS=$ac_cv_path_MCS
1.11991 -if test -n "$MCS"; then
1.11992 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5
1.11993 -$as_echo "$MCS" >&6; }
1.11994 -else
1.11995 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.11996 -$as_echo "no" >&6; }
1.11997 -fi
1.11998 -
1.11999 -
1.12000 - if test "x$MCS" = x; then
1.12001 - as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.12002 - fi
1.12003 - else
1.12004 - # Otherwise we believe it is a complete path. Use it as it is.
1.12005 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool MCS=$tool_specified" >&5
1.12006 -$as_echo "$as_me: Will use user supplied tool MCS=$tool_specified" >&6;}
1.12007 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCS" >&5
1.12008 -$as_echo_n "checking for MCS... " >&6; }
1.12009 - if test ! -x "$tool_specified"; then
1.12010 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.12011 -$as_echo "not found" >&6; }
1.12012 - as_fn_error $? "User supplied tool MCS=$tool_specified does not exist or is not executable" "$LINENO" 5
1.12013 - fi
1.12014 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.12015 -$as_echo "$tool_specified" >&6; }
1.12016 - fi
1.12017 - fi
1.12018 - fi
1.12019 -
1.12020 -
1.12021 -
1.12022 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.12023 -
1.12024 - # First separate the path from the arguments. This will split at the first
1.12025 - # space.
1.12026 - complete="$MCS"
1.12027 + OBJDUMP="$new_complete"
1.12028 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJDUMP to \"$new_complete\"" >&5
1.12029 +$as_echo "$as_me: Rewriting OBJDUMP to \"$new_complete\"" >&6;}
1.12030 + fi
1.12031 +
1.12032 + fi
1.12033 +
1.12034 +
1.12035 + # Restore old path.
1.12036 + PATH="$OLD_PATH"
1.12037 +
1.12038 + # Restore the flags to the user specified values.
1.12039 + # This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"
1.12040 + CFLAGS="$ORG_CFLAGS"
1.12041 + CXXFLAGS="$ORG_CXXFLAGS"
1.12042 + OBJCFLAGS="$ORG_OBJCFLAGS"
1.12043 +
1.12044 +
1.12045 +# Finally do some processing after the detection phase
1.12046 +
1.12047 + if test "x$COMPILE_TYPE" = "xcross"; then
1.12048 + # Now we need to find a C/C++ compiler that can build executables for the
1.12049 + # build platform. We can't use the AC_PROG_CC macro, since it can only be
1.12050 + # used once. Also, we need to do this without adding a tools dir to the
1.12051 + # path, otherwise we might pick up cross-compilers which don't use standard
1.12052 + # naming.
1.12053 +
1.12054 + # FIXME: we should list the discovered compilers as an exclude pattern!
1.12055 + # If we do that, we can do this detection before POST_DETECTION, and still
1.12056 + # find the build compilers in the tools dir, if needed.
1.12057 +
1.12058 +
1.12059 + # Publish this variable in the help.
1.12060 +
1.12061 +
1.12062 + if test "x$BUILD_CC" = x; then
1.12063 + # The variable is not set by user, try to locate tool using the code snippet
1.12064 + for ac_prog in cl cc gcc
1.12065 +do
1.12066 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.12067 +set dummy $ac_prog; ac_word=$2
1.12068 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.12069 +$as_echo_n "checking for $ac_word... " >&6; }
1.12070 +if ${ac_cv_path_BUILD_CC+:} false; then :
1.12071 + $as_echo_n "(cached) " >&6
1.12072 +else
1.12073 + case $BUILD_CC in
1.12074 + [\\/]* | ?:[\\/]*)
1.12075 + ac_cv_path_BUILD_CC="$BUILD_CC" # Let the user override the test with a path.
1.12076 + ;;
1.12077 + *)
1.12078 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.12079 +for as_dir in $PATH
1.12080 +do
1.12081 + IFS=$as_save_IFS
1.12082 + test -z "$as_dir" && as_dir=.
1.12083 + for ac_exec_ext in '' $ac_executable_extensions; do
1.12084 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.12085 + ac_cv_path_BUILD_CC="$as_dir/$ac_word$ac_exec_ext"
1.12086 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.12087 + break 2
1.12088 + fi
1.12089 +done
1.12090 + done
1.12091 +IFS=$as_save_IFS
1.12092 +
1.12093 + ;;
1.12094 +esac
1.12095 +fi
1.12096 +BUILD_CC=$ac_cv_path_BUILD_CC
1.12097 +if test -n "$BUILD_CC"; then
1.12098 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
1.12099 +$as_echo "$BUILD_CC" >&6; }
1.12100 +else
1.12101 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.12102 +$as_echo "no" >&6; }
1.12103 +fi
1.12104 +
1.12105 +
1.12106 + test -n "$BUILD_CC" && break
1.12107 +done
1.12108 +
1.12109 + else
1.12110 + # The variable is set, but is it from the command line or the environment?
1.12111 +
1.12112 + # Try to remove the string !BUILD_CC! from our list.
1.12113 + try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!BUILD_CC!/}
1.12114 + if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.12115 + # If it failed, the variable was not from the command line. Ignore it,
1.12116 + # but warn the user (except for BASH, which is always set by the calling BASH).
1.12117 + if test "xBUILD_CC" != xBASH; then
1.12118 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of BUILD_CC from the environment. Use command line variables instead." >&5
1.12119 +$as_echo "$as_me: WARNING: Ignoring value of BUILD_CC from the environment. Use command line variables instead." >&2;}
1.12120 + fi
1.12121 + # Try to locate tool using the code snippet
1.12122 + for ac_prog in cl cc gcc
1.12123 +do
1.12124 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.12125 +set dummy $ac_prog; ac_word=$2
1.12126 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.12127 +$as_echo_n "checking for $ac_word... " >&6; }
1.12128 +if ${ac_cv_path_BUILD_CC+:} false; then :
1.12129 + $as_echo_n "(cached) " >&6
1.12130 +else
1.12131 + case $BUILD_CC in
1.12132 + [\\/]* | ?:[\\/]*)
1.12133 + ac_cv_path_BUILD_CC="$BUILD_CC" # Let the user override the test with a path.
1.12134 + ;;
1.12135 + *)
1.12136 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.12137 +for as_dir in $PATH
1.12138 +do
1.12139 + IFS=$as_save_IFS
1.12140 + test -z "$as_dir" && as_dir=.
1.12141 + for ac_exec_ext in '' $ac_executable_extensions; do
1.12142 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.12143 + ac_cv_path_BUILD_CC="$as_dir/$ac_word$ac_exec_ext"
1.12144 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.12145 + break 2
1.12146 + fi
1.12147 +done
1.12148 + done
1.12149 +IFS=$as_save_IFS
1.12150 +
1.12151 + ;;
1.12152 +esac
1.12153 +fi
1.12154 +BUILD_CC=$ac_cv_path_BUILD_CC
1.12155 +if test -n "$BUILD_CC"; then
1.12156 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
1.12157 +$as_echo "$BUILD_CC" >&6; }
1.12158 +else
1.12159 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.12160 +$as_echo "no" >&6; }
1.12161 +fi
1.12162 +
1.12163 +
1.12164 + test -n "$BUILD_CC" && break
1.12165 +done
1.12166 +
1.12167 + else
1.12168 + # If it succeeded, then it was overridden by the user. We will use it
1.12169 + # for the tool.
1.12170 +
1.12171 + # First remove it from the list of overridden variables, so we can test
1.12172 + # for unknown variables in the end.
1.12173 + CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.12174 +
1.12175 + # Check if the provided tool contains a complete path.
1.12176 + tool_specified="$BUILD_CC"
1.12177 + tool_basename="${tool_specified##*/}"
1.12178 + if test "x$tool_basename" = "x$tool_specified"; then
1.12179 + # A command without a complete path is provided, search $PATH.
1.12180 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool BUILD_CC=$tool_basename" >&5
1.12181 +$as_echo "$as_me: Will search for user supplied tool BUILD_CC=$tool_basename" >&6;}
1.12182 + # Extract the first word of "$tool_basename", so it can be a program name with args.
1.12183 +set dummy $tool_basename; ac_word=$2
1.12184 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.12185 +$as_echo_n "checking for $ac_word... " >&6; }
1.12186 +if ${ac_cv_path_BUILD_CC+:} false; then :
1.12187 + $as_echo_n "(cached) " >&6
1.12188 +else
1.12189 + case $BUILD_CC in
1.12190 + [\\/]* | ?:[\\/]*)
1.12191 + ac_cv_path_BUILD_CC="$BUILD_CC" # Let the user override the test with a path.
1.12192 + ;;
1.12193 + *)
1.12194 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.12195 +for as_dir in $PATH
1.12196 +do
1.12197 + IFS=$as_save_IFS
1.12198 + test -z "$as_dir" && as_dir=.
1.12199 + for ac_exec_ext in '' $ac_executable_extensions; do
1.12200 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.12201 + ac_cv_path_BUILD_CC="$as_dir/$ac_word$ac_exec_ext"
1.12202 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.12203 + break 2
1.12204 + fi
1.12205 +done
1.12206 + done
1.12207 +IFS=$as_save_IFS
1.12208 +
1.12209 + ;;
1.12210 +esac
1.12211 +fi
1.12212 +BUILD_CC=$ac_cv_path_BUILD_CC
1.12213 +if test -n "$BUILD_CC"; then
1.12214 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
1.12215 +$as_echo "$BUILD_CC" >&6; }
1.12216 +else
1.12217 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.12218 +$as_echo "no" >&6; }
1.12219 +fi
1.12220 +
1.12221 +
1.12222 + if test "x$BUILD_CC" = x; then
1.12223 + as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.12224 + fi
1.12225 + else
1.12226 + # Otherwise we believe it is a complete path. Use it as it is.
1.12227 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool BUILD_CC=$tool_specified" >&5
1.12228 +$as_echo "$as_me: Will use user supplied tool BUILD_CC=$tool_specified" >&6;}
1.12229 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BUILD_CC" >&5
1.12230 +$as_echo_n "checking for BUILD_CC... " >&6; }
1.12231 + if test ! -x "$tool_specified"; then
1.12232 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.12233 +$as_echo "not found" >&6; }
1.12234 + as_fn_error $? "User supplied tool BUILD_CC=$tool_specified does not exist or is not executable" "$LINENO" 5
1.12235 + fi
1.12236 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.12237 +$as_echo "$tool_specified" >&6; }
1.12238 + fi
1.12239 + fi
1.12240 + fi
1.12241 +
1.12242 +
1.12243 +
1.12244 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.12245 +
1.12246 + # First separate the path from the arguments. This will split at the first
1.12247 + # space.
1.12248 + complete="$BUILD_CC"
1.12249 path="${complete%% *}"
1.12250 tmp="$complete EOL"
1.12251 arguments="${tmp#* }"
1.12252 @@ -36531,14 +37646,14 @@
1.12253 fi
1.12254 if test "x$new_path" = x; then
1.12255 # It's still not found. Now this is an unrecoverable error.
1.12256 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5
1.12257 -$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;}
1.12258 - has_space=`$ECHO "$complete" | $GREP " "`
1.12259 - if test "x$has_space" != x; then
1.12260 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.12261 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.12262 - fi
1.12263 - as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
1.12264 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&5
1.12265 +$as_echo "$as_me: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&6;}
1.12266 + has_space=`$ECHO "$complete" | $GREP " "`
1.12267 + if test "x$has_space" != x; then
1.12268 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.12269 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.12270 + fi
1.12271 + as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5
1.12272 fi
1.12273 fi
1.12274
1.12275 @@ -36558,11 +37673,11 @@
1.12276 elif test -f "${new_path}.cmd"; then
1.12277 input_to_shortpath="${new_path}.cmd"
1.12278 else
1.12279 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$new_path\", is invalid." >&5
1.12280 -$as_echo "$as_me: The path of MCS, which resolves as \"$new_path\", is invalid." >&6;}
1.12281 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$new_path\", is invalid." >&5
1.12282 +$as_echo "$as_me: The path of BUILD_CC, which resolves as \"$new_path\", is invalid." >&6;}
1.12283 { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.12284 $as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.12285 - as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
1.12286 + as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5
1.12287 fi
1.12288 else
1.12289 input_to_shortpath="$new_path"
1.12290 @@ -36609,7 +37724,7 @@
1.12291
1.12292 # First separate the path from the arguments. This will split at the first
1.12293 # space.
1.12294 - complete="$MCS"
1.12295 + complete="$BUILD_CC"
1.12296 path="${complete%% *}"
1.12297 tmp="$complete EOL"
1.12298 arguments="${tmp#* }"
1.12299 @@ -36654,14 +37769,14 @@
1.12300
1.12301 if test "x$new_path" = x; then
1.12302 # It's still not found. Now this is an unrecoverable error.
1.12303 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5
1.12304 -$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;}
1.12305 - has_space=`$ECHO "$complete" | $GREP " "`
1.12306 - if test "x$has_space" != x; then
1.12307 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.12308 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.12309 - fi
1.12310 - as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
1.12311 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&5
1.12312 +$as_echo "$as_me: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&6;}
1.12313 + has_space=`$ECHO "$complete" | $GREP " "`
1.12314 + if test "x$has_space" != x; then
1.12315 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.12316 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.12317 + fi
1.12318 + as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5
1.12319 fi
1.12320 fi
1.12321
1.12322 @@ -36707,7 +37822,7 @@
1.12323 # We're on a posix platform. Hooray! :)
1.12324 # First separate the path from the arguments. This will split at the first
1.12325 # space.
1.12326 - complete="$MCS"
1.12327 + complete="$BUILD_CC"
1.12328 path="${complete%% *}"
1.12329 tmp="$complete EOL"
1.12330 arguments="${tmp#* }"
1.12331 @@ -36726,20 +37841,19 @@
1.12332 done
1.12333 IFS="$IFS_save"
1.12334 else
1.12335 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving MCS (as $path) failed, using $path directly." >&5
1.12336 -$as_echo "$as_me: Resolving MCS (as $path) failed, using $path directly." >&6;}
1.12337 + # This is an absolute path, we can use it without further modifications.
1.12338 new_path="$path"
1.12339 fi
1.12340
1.12341 if test "x$new_path" = x; then
1.12342 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5
1.12343 -$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;}
1.12344 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&5
1.12345 +$as_echo "$as_me: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&6;}
1.12346 has_space=`$ECHO "$complete" | $GREP " "`
1.12347 if test "x$has_space" != x; then
1.12348 { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.12349 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.12350 fi
1.12351 - as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
1.12352 + as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5
1.12353 fi
1.12354 fi
1.12355
1.12356 @@ -36751,357 +37865,203 @@
1.12357 fi
1.12358
1.12359 if test "x$complete" != "x$new_complete"; then
1.12360 - MCS="$new_complete"
1.12361 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MCS to \"$new_complete\"" >&5
1.12362 -$as_echo "$as_me: Rewriting MCS to \"$new_complete\"" >&6;}
1.12363 - fi
1.12364 -
1.12365 - elif test "x$OPENJDK_TARGET_OS" != xwindows; then
1.12366 - # Extract the first word of "otool", so it can be a program name with args.
1.12367 -set dummy otool; ac_word=$2
1.12368 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.12369 -$as_echo_n "checking for $ac_word... " >&6; }
1.12370 -if ${ac_cv_path_OTOOL+:} false; then :
1.12371 - $as_echo_n "(cached) " >&6
1.12372 -else
1.12373 - case $OTOOL in
1.12374 - [\\/]* | ?:[\\/]*)
1.12375 - ac_cv_path_OTOOL="$OTOOL" # Let the user override the test with a path.
1.12376 - ;;
1.12377 - *)
1.12378 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.12379 -for as_dir in $PATH
1.12380 -do
1.12381 - IFS=$as_save_IFS
1.12382 - test -z "$as_dir" && as_dir=.
1.12383 - for ac_exec_ext in '' $ac_executable_extensions; do
1.12384 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.12385 - ac_cv_path_OTOOL="$as_dir/$ac_word$ac_exec_ext"
1.12386 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.12387 - break 2
1.12388 - fi
1.12389 -done
1.12390 - done
1.12391 -IFS=$as_save_IFS
1.12392 -
1.12393 - ;;
1.12394 -esac
1.12395 -fi
1.12396 -OTOOL=$ac_cv_path_OTOOL
1.12397 -if test -n "$OTOOL"; then
1.12398 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
1.12399 -$as_echo "$OTOOL" >&6; }
1.12400 -else
1.12401 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.12402 -$as_echo "no" >&6; }
1.12403 -fi
1.12404 -
1.12405 -
1.12406 - if test "x$OTOOL" = "x"; then
1.12407 - OTOOL="true"
1.12408 - fi
1.12409 -
1.12410 -
1.12411 - # Publish this variable in the help.
1.12412 -
1.12413 -
1.12414 - if test "x$NM" = x; then
1.12415 - # The variable is not set by user, try to locate tool using the code snippet
1.12416 - if test -n "$ac_tool_prefix"; then
1.12417 - for ac_prog in nm
1.12418 - do
1.12419 - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.12420 -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.12421 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.12422 -$as_echo_n "checking for $ac_word... " >&6; }
1.12423 -if ${ac_cv_prog_NM+:} false; then :
1.12424 - $as_echo_n "(cached) " >&6
1.12425 -else
1.12426 - if test -n "$NM"; then
1.12427 - ac_cv_prog_NM="$NM" # Let the user override the test.
1.12428 -else
1.12429 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.12430 -for as_dir in $PATH
1.12431 -do
1.12432 - IFS=$as_save_IFS
1.12433 - test -z "$as_dir" && as_dir=.
1.12434 - for ac_exec_ext in '' $ac_executable_extensions; do
1.12435 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.12436 - ac_cv_prog_NM="$ac_tool_prefix$ac_prog"
1.12437 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.12438 - break 2
1.12439 - fi
1.12440 -done
1.12441 - done
1.12442 -IFS=$as_save_IFS
1.12443 -
1.12444 -fi
1.12445 -fi
1.12446 -NM=$ac_cv_prog_NM
1.12447 -if test -n "$NM"; then
1.12448 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
1.12449 -$as_echo "$NM" >&6; }
1.12450 -else
1.12451 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.12452 -$as_echo "no" >&6; }
1.12453 -fi
1.12454 -
1.12455 -
1.12456 - test -n "$NM" && break
1.12457 - done
1.12458 -fi
1.12459 -if test -z "$NM"; then
1.12460 - ac_ct_NM=$NM
1.12461 - for ac_prog in nm
1.12462 -do
1.12463 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.12464 -set dummy $ac_prog; ac_word=$2
1.12465 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.12466 -$as_echo_n "checking for $ac_word... " >&6; }
1.12467 -if ${ac_cv_prog_ac_ct_NM+:} false; then :
1.12468 - $as_echo_n "(cached) " >&6
1.12469 -else
1.12470 - if test -n "$ac_ct_NM"; then
1.12471 - ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test.
1.12472 -else
1.12473 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.12474 -for as_dir in $PATH
1.12475 -do
1.12476 - IFS=$as_save_IFS
1.12477 - test -z "$as_dir" && as_dir=.
1.12478 - for ac_exec_ext in '' $ac_executable_extensions; do
1.12479 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.12480 - ac_cv_prog_ac_ct_NM="$ac_prog"
1.12481 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.12482 - break 2
1.12483 - fi
1.12484 -done
1.12485 - done
1.12486 -IFS=$as_save_IFS
1.12487 -
1.12488 -fi
1.12489 -fi
1.12490 -ac_ct_NM=$ac_cv_prog_ac_ct_NM
1.12491 -if test -n "$ac_ct_NM"; then
1.12492 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NM" >&5
1.12493 -$as_echo "$ac_ct_NM" >&6; }
1.12494 -else
1.12495 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.12496 -$as_echo "no" >&6; }
1.12497 -fi
1.12498 -
1.12499 -
1.12500 - test -n "$ac_ct_NM" && break
1.12501 -done
1.12502 -
1.12503 - if test "x$ac_ct_NM" = x; then
1.12504 - NM=""
1.12505 - else
1.12506 - case $cross_compiling:$ac_tool_warned in
1.12507 -yes:)
1.12508 -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.12509 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.12510 -ac_tool_warned=yes ;;
1.12511 -esac
1.12512 - NM=$ac_ct_NM
1.12513 - fi
1.12514 -fi
1.12515 -
1.12516 - else
1.12517 - # The variable is set, but is it from the command line or the environment?
1.12518 -
1.12519 - # Try to remove the string !NM! from our list.
1.12520 - try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!NM!/}
1.12521 - if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.12522 - # If it failed, the variable was not from the command line. Ignore it,
1.12523 - # but warn the user (except for BASH, which is always set by the calling BASH).
1.12524 - if test "xNM" != xBASH; then
1.12525 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of NM from the environment. Use command line variables instead." >&5
1.12526 -$as_echo "$as_me: WARNING: Ignoring value of NM from the environment. Use command line variables instead." >&2;}
1.12527 - fi
1.12528 - # Try to locate tool using the code snippet
1.12529 - if test -n "$ac_tool_prefix"; then
1.12530 - for ac_prog in nm
1.12531 - do
1.12532 - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.12533 -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.12534 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.12535 -$as_echo_n "checking for $ac_word... " >&6; }
1.12536 -if ${ac_cv_prog_NM+:} false; then :
1.12537 - $as_echo_n "(cached) " >&6
1.12538 -else
1.12539 - if test -n "$NM"; then
1.12540 - ac_cv_prog_NM="$NM" # Let the user override the test.
1.12541 -else
1.12542 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.12543 -for as_dir in $PATH
1.12544 -do
1.12545 - IFS=$as_save_IFS
1.12546 - test -z "$as_dir" && as_dir=.
1.12547 - for ac_exec_ext in '' $ac_executable_extensions; do
1.12548 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.12549 - ac_cv_prog_NM="$ac_tool_prefix$ac_prog"
1.12550 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.12551 - break 2
1.12552 - fi
1.12553 -done
1.12554 - done
1.12555 -IFS=$as_save_IFS
1.12556 -
1.12557 -fi
1.12558 -fi
1.12559 -NM=$ac_cv_prog_NM
1.12560 -if test -n "$NM"; then
1.12561 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
1.12562 -$as_echo "$NM" >&6; }
1.12563 -else
1.12564 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.12565 -$as_echo "no" >&6; }
1.12566 -fi
1.12567 -
1.12568 -
1.12569 - test -n "$NM" && break
1.12570 - done
1.12571 -fi
1.12572 -if test -z "$NM"; then
1.12573 - ac_ct_NM=$NM
1.12574 - for ac_prog in nm
1.12575 -do
1.12576 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.12577 -set dummy $ac_prog; ac_word=$2
1.12578 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.12579 -$as_echo_n "checking for $ac_word... " >&6; }
1.12580 -if ${ac_cv_prog_ac_ct_NM+:} false; then :
1.12581 - $as_echo_n "(cached) " >&6
1.12582 -else
1.12583 - if test -n "$ac_ct_NM"; then
1.12584 - ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test.
1.12585 -else
1.12586 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.12587 -for as_dir in $PATH
1.12588 -do
1.12589 - IFS=$as_save_IFS
1.12590 - test -z "$as_dir" && as_dir=.
1.12591 - for ac_exec_ext in '' $ac_executable_extensions; do
1.12592 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.12593 - ac_cv_prog_ac_ct_NM="$ac_prog"
1.12594 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.12595 - break 2
1.12596 - fi
1.12597 -done
1.12598 - done
1.12599 -IFS=$as_save_IFS
1.12600 -
1.12601 -fi
1.12602 -fi
1.12603 -ac_ct_NM=$ac_cv_prog_ac_ct_NM
1.12604 -if test -n "$ac_ct_NM"; then
1.12605 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NM" >&5
1.12606 -$as_echo "$ac_ct_NM" >&6; }
1.12607 -else
1.12608 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.12609 -$as_echo "no" >&6; }
1.12610 -fi
1.12611 -
1.12612 -
1.12613 - test -n "$ac_ct_NM" && break
1.12614 -done
1.12615 -
1.12616 - if test "x$ac_ct_NM" = x; then
1.12617 - NM=""
1.12618 - else
1.12619 - case $cross_compiling:$ac_tool_warned in
1.12620 -yes:)
1.12621 -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.12622 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.12623 -ac_tool_warned=yes ;;
1.12624 -esac
1.12625 - NM=$ac_ct_NM
1.12626 - fi
1.12627 -fi
1.12628 -
1.12629 - else
1.12630 - # If it succeeded, then it was overridden by the user. We will use it
1.12631 - # for the tool.
1.12632 -
1.12633 - # First remove it from the list of overridden variables, so we can test
1.12634 - # for unknown variables in the end.
1.12635 - CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.12636 -
1.12637 - # Check if the provided tool contains a complete path.
1.12638 - tool_specified="$NM"
1.12639 - tool_basename="${tool_specified##*/}"
1.12640 - if test "x$tool_basename" = "x$tool_specified"; then
1.12641 - # A command without a complete path is provided, search $PATH.
1.12642 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool NM=$tool_basename" >&5
1.12643 -$as_echo "$as_me: Will search for user supplied tool NM=$tool_basename" >&6;}
1.12644 - # Extract the first word of "$tool_basename", so it can be a program name with args.
1.12645 -set dummy $tool_basename; ac_word=$2
1.12646 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.12647 -$as_echo_n "checking for $ac_word... " >&6; }
1.12648 -if ${ac_cv_path_NM+:} false; then :
1.12649 - $as_echo_n "(cached) " >&6
1.12650 -else
1.12651 - case $NM in
1.12652 - [\\/]* | ?:[\\/]*)
1.12653 - ac_cv_path_NM="$NM" # Let the user override the test with a path.
1.12654 - ;;
1.12655 - *)
1.12656 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.12657 -for as_dir in $PATH
1.12658 -do
1.12659 - IFS=$as_save_IFS
1.12660 - test -z "$as_dir" && as_dir=.
1.12661 - for ac_exec_ext in '' $ac_executable_extensions; do
1.12662 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.12663 - ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext"
1.12664 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.12665 - break 2
1.12666 - fi
1.12667 -done
1.12668 - done
1.12669 -IFS=$as_save_IFS
1.12670 -
1.12671 - ;;
1.12672 -esac
1.12673 -fi
1.12674 -NM=$ac_cv_path_NM
1.12675 -if test -n "$NM"; then
1.12676 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
1.12677 -$as_echo "$NM" >&6; }
1.12678 -else
1.12679 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.12680 -$as_echo "no" >&6; }
1.12681 -fi
1.12682 -
1.12683 -
1.12684 - if test "x$NM" = x; then
1.12685 - as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.12686 - fi
1.12687 - else
1.12688 - # Otherwise we believe it is a complete path. Use it as it is.
1.12689 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool NM=$tool_specified" >&5
1.12690 -$as_echo "$as_me: Will use user supplied tool NM=$tool_specified" >&6;}
1.12691 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NM" >&5
1.12692 -$as_echo_n "checking for NM... " >&6; }
1.12693 - if test ! -x "$tool_specified"; then
1.12694 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.12695 -$as_echo "not found" >&6; }
1.12696 - as_fn_error $? "User supplied tool NM=$tool_specified does not exist or is not executable" "$LINENO" 5
1.12697 - fi
1.12698 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.12699 -$as_echo "$tool_specified" >&6; }
1.12700 - fi
1.12701 - fi
1.12702 - fi
1.12703 -
1.12704 -
1.12705 -
1.12706 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.12707 -
1.12708 - # First separate the path from the arguments. This will split at the first
1.12709 - # space.
1.12710 - complete="$NM"
1.12711 + BUILD_CC="$new_complete"
1.12712 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CC to \"$new_complete\"" >&5
1.12713 +$as_echo "$as_me: Rewriting BUILD_CC to \"$new_complete\"" >&6;}
1.12714 + fi
1.12715 +
1.12716 +
1.12717 +
1.12718 + # Publish this variable in the help.
1.12719 +
1.12720 +
1.12721 + if test "x$BUILD_CXX" = x; then
1.12722 + # The variable is not set by user, try to locate tool using the code snippet
1.12723 + for ac_prog in cl CC g++
1.12724 +do
1.12725 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.12726 +set dummy $ac_prog; ac_word=$2
1.12727 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.12728 +$as_echo_n "checking for $ac_word... " >&6; }
1.12729 +if ${ac_cv_path_BUILD_CXX+:} false; then :
1.12730 + $as_echo_n "(cached) " >&6
1.12731 +else
1.12732 + case $BUILD_CXX in
1.12733 + [\\/]* | ?:[\\/]*)
1.12734 + ac_cv_path_BUILD_CXX="$BUILD_CXX" # Let the user override the test with a path.
1.12735 + ;;
1.12736 + *)
1.12737 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.12738 +for as_dir in $PATH
1.12739 +do
1.12740 + IFS=$as_save_IFS
1.12741 + test -z "$as_dir" && as_dir=.
1.12742 + for ac_exec_ext in '' $ac_executable_extensions; do
1.12743 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.12744 + ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
1.12745 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.12746 + break 2
1.12747 + fi
1.12748 +done
1.12749 + done
1.12750 +IFS=$as_save_IFS
1.12751 +
1.12752 + ;;
1.12753 +esac
1.12754 +fi
1.12755 +BUILD_CXX=$ac_cv_path_BUILD_CXX
1.12756 +if test -n "$BUILD_CXX"; then
1.12757 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CXX" >&5
1.12758 +$as_echo "$BUILD_CXX" >&6; }
1.12759 +else
1.12760 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.12761 +$as_echo "no" >&6; }
1.12762 +fi
1.12763 +
1.12764 +
1.12765 + test -n "$BUILD_CXX" && break
1.12766 +done
1.12767 +
1.12768 + else
1.12769 + # The variable is set, but is it from the command line or the environment?
1.12770 +
1.12771 + # Try to remove the string !BUILD_CXX! from our list.
1.12772 + try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!BUILD_CXX!/}
1.12773 + if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.12774 + # If it failed, the variable was not from the command line. Ignore it,
1.12775 + # but warn the user (except for BASH, which is always set by the calling BASH).
1.12776 + if test "xBUILD_CXX" != xBASH; then
1.12777 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of BUILD_CXX from the environment. Use command line variables instead." >&5
1.12778 +$as_echo "$as_me: WARNING: Ignoring value of BUILD_CXX from the environment. Use command line variables instead." >&2;}
1.12779 + fi
1.12780 + # Try to locate tool using the code snippet
1.12781 + for ac_prog in cl CC g++
1.12782 +do
1.12783 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.12784 +set dummy $ac_prog; ac_word=$2
1.12785 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.12786 +$as_echo_n "checking for $ac_word... " >&6; }
1.12787 +if ${ac_cv_path_BUILD_CXX+:} false; then :
1.12788 + $as_echo_n "(cached) " >&6
1.12789 +else
1.12790 + case $BUILD_CXX in
1.12791 + [\\/]* | ?:[\\/]*)
1.12792 + ac_cv_path_BUILD_CXX="$BUILD_CXX" # Let the user override the test with a path.
1.12793 + ;;
1.12794 + *)
1.12795 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.12796 +for as_dir in $PATH
1.12797 +do
1.12798 + IFS=$as_save_IFS
1.12799 + test -z "$as_dir" && as_dir=.
1.12800 + for ac_exec_ext in '' $ac_executable_extensions; do
1.12801 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.12802 + ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
1.12803 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.12804 + break 2
1.12805 + fi
1.12806 +done
1.12807 + done
1.12808 +IFS=$as_save_IFS
1.12809 +
1.12810 + ;;
1.12811 +esac
1.12812 +fi
1.12813 +BUILD_CXX=$ac_cv_path_BUILD_CXX
1.12814 +if test -n "$BUILD_CXX"; then
1.12815 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CXX" >&5
1.12816 +$as_echo "$BUILD_CXX" >&6; }
1.12817 +else
1.12818 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.12819 +$as_echo "no" >&6; }
1.12820 +fi
1.12821 +
1.12822 +
1.12823 + test -n "$BUILD_CXX" && break
1.12824 +done
1.12825 +
1.12826 + else
1.12827 + # If it succeeded, then it was overridden by the user. We will use it
1.12828 + # for the tool.
1.12829 +
1.12830 + # First remove it from the list of overridden variables, so we can test
1.12831 + # for unknown variables in the end.
1.12832 + CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.12833 +
1.12834 + # Check if the provided tool contains a complete path.
1.12835 + tool_specified="$BUILD_CXX"
1.12836 + tool_basename="${tool_specified##*/}"
1.12837 + if test "x$tool_basename" = "x$tool_specified"; then
1.12838 + # A command without a complete path is provided, search $PATH.
1.12839 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool BUILD_CXX=$tool_basename" >&5
1.12840 +$as_echo "$as_me: Will search for user supplied tool BUILD_CXX=$tool_basename" >&6;}
1.12841 + # Extract the first word of "$tool_basename", so it can be a program name with args.
1.12842 +set dummy $tool_basename; ac_word=$2
1.12843 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.12844 +$as_echo_n "checking for $ac_word... " >&6; }
1.12845 +if ${ac_cv_path_BUILD_CXX+:} false; then :
1.12846 + $as_echo_n "(cached) " >&6
1.12847 +else
1.12848 + case $BUILD_CXX in
1.12849 + [\\/]* | ?:[\\/]*)
1.12850 + ac_cv_path_BUILD_CXX="$BUILD_CXX" # Let the user override the test with a path.
1.12851 + ;;
1.12852 + *)
1.12853 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.12854 +for as_dir in $PATH
1.12855 +do
1.12856 + IFS=$as_save_IFS
1.12857 + test -z "$as_dir" && as_dir=.
1.12858 + for ac_exec_ext in '' $ac_executable_extensions; do
1.12859 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.12860 + ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
1.12861 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.12862 + break 2
1.12863 + fi
1.12864 +done
1.12865 + done
1.12866 +IFS=$as_save_IFS
1.12867 +
1.12868 + ;;
1.12869 +esac
1.12870 +fi
1.12871 +BUILD_CXX=$ac_cv_path_BUILD_CXX
1.12872 +if test -n "$BUILD_CXX"; then
1.12873 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CXX" >&5
1.12874 +$as_echo "$BUILD_CXX" >&6; }
1.12875 +else
1.12876 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.12877 +$as_echo "no" >&6; }
1.12878 +fi
1.12879 +
1.12880 +
1.12881 + if test "x$BUILD_CXX" = x; then
1.12882 + as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.12883 + fi
1.12884 + else
1.12885 + # Otherwise we believe it is a complete path. Use it as it is.
1.12886 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool BUILD_CXX=$tool_specified" >&5
1.12887 +$as_echo "$as_me: Will use user supplied tool BUILD_CXX=$tool_specified" >&6;}
1.12888 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BUILD_CXX" >&5
1.12889 +$as_echo_n "checking for BUILD_CXX... " >&6; }
1.12890 + if test ! -x "$tool_specified"; then
1.12891 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.12892 +$as_echo "not found" >&6; }
1.12893 + as_fn_error $? "User supplied tool BUILD_CXX=$tool_specified does not exist or is not executable" "$LINENO" 5
1.12894 + fi
1.12895 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.12896 +$as_echo "$tool_specified" >&6; }
1.12897 + fi
1.12898 + fi
1.12899 + fi
1.12900 +
1.12901 +
1.12902 +
1.12903 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.12904 +
1.12905 + # First separate the path from the arguments. This will split at the first
1.12906 + # space.
1.12907 + complete="$BUILD_CXX"
1.12908 path="${complete%% *}"
1.12909 tmp="$complete EOL"
1.12910 arguments="${tmp#* }"
1.12911 @@ -37137,14 +38097,14 @@
1.12912 fi
1.12913 if test "x$new_path" = x; then
1.12914 # It's still not found. Now this is an unrecoverable error.
1.12915 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
1.12916 -$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
1.12917 - has_space=`$ECHO "$complete" | $GREP " "`
1.12918 - if test "x$has_space" != x; then
1.12919 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.12920 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.12921 - fi
1.12922 - as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
1.12923 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&5
1.12924 +$as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&6;}
1.12925 + has_space=`$ECHO "$complete" | $GREP " "`
1.12926 + if test "x$has_space" != x; then
1.12927 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.12928 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.12929 + fi
1.12930 + as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5
1.12931 fi
1.12932 fi
1.12933
1.12934 @@ -37164,11 +38124,11 @@
1.12935 elif test -f "${new_path}.cmd"; then
1.12936 input_to_shortpath="${new_path}.cmd"
1.12937 else
1.12938 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$new_path\", is invalid." >&5
1.12939 -$as_echo "$as_me: The path of NM, which resolves as \"$new_path\", is invalid." >&6;}
1.12940 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$new_path\", is invalid." >&5
1.12941 +$as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$new_path\", is invalid." >&6;}
1.12942 { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.12943 $as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.12944 - as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
1.12945 + as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5
1.12946 fi
1.12947 else
1.12948 input_to_shortpath="$new_path"
1.12949 @@ -37215,7 +38175,7 @@
1.12950
1.12951 # First separate the path from the arguments. This will split at the first
1.12952 # space.
1.12953 - complete="$NM"
1.12954 + complete="$BUILD_CXX"
1.12955 path="${complete%% *}"
1.12956 tmp="$complete EOL"
1.12957 arguments="${tmp#* }"
1.12958 @@ -37260,14 +38220,14 @@
1.12959
1.12960 if test "x$new_path" = x; then
1.12961 # It's still not found. Now this is an unrecoverable error.
1.12962 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
1.12963 -$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
1.12964 - has_space=`$ECHO "$complete" | $GREP " "`
1.12965 - if test "x$has_space" != x; then
1.12966 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.12967 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.12968 - fi
1.12969 - as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
1.12970 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&5
1.12971 +$as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&6;}
1.12972 + has_space=`$ECHO "$complete" | $GREP " "`
1.12973 + if test "x$has_space" != x; then
1.12974 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.12975 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.12976 + fi
1.12977 + as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5
1.12978 fi
1.12979 fi
1.12980
1.12981 @@ -37313,7 +38273,7 @@
1.12982 # We're on a posix platform. Hooray! :)
1.12983 # First separate the path from the arguments. This will split at the first
1.12984 # space.
1.12985 - complete="$NM"
1.12986 + complete="$BUILD_CXX"
1.12987 path="${complete%% *}"
1.12988 tmp="$complete EOL"
1.12989 arguments="${tmp#* }"
1.12990 @@ -37332,20 +38292,19 @@
1.12991 done
1.12992 IFS="$IFS_save"
1.12993 else
1.12994 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving NM (as $path) failed, using $path directly." >&5
1.12995 -$as_echo "$as_me: Resolving NM (as $path) failed, using $path directly." >&6;}
1.12996 + # This is an absolute path, we can use it without further modifications.
1.12997 new_path="$path"
1.12998 fi
1.12999
1.13000 if test "x$new_path" = x; then
1.13001 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
1.13002 -$as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
1.13003 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&5
1.13004 +$as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&6;}
1.13005 has_space=`$ECHO "$complete" | $GREP " "`
1.13006 if test "x$has_space" != x; then
1.13007 { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.13008 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.13009 fi
1.13010 - as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
1.13011 + as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5
1.13012 fi
1.13013 fi
1.13014
1.13015 @@ -37357,315 +38316,203 @@
1.13016 fi
1.13017
1.13018 if test "x$complete" != "x$new_complete"; then
1.13019 - NM="$new_complete"
1.13020 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting NM to \"$new_complete\"" >&5
1.13021 -$as_echo "$as_me: Rewriting NM to \"$new_complete\"" >&6;}
1.13022 - fi
1.13023 -
1.13024 - GNM="$NM"
1.13025 -
1.13026 -
1.13027 -
1.13028 - # Publish this variable in the help.
1.13029 -
1.13030 -
1.13031 - if test "x$STRIP" = x; then
1.13032 - # The variable is not set by user, try to locate tool using the code snippet
1.13033 - if test -n "$ac_tool_prefix"; then
1.13034 - for ac_prog in strip
1.13035 - do
1.13036 - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.13037 -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.13038 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.13039 -$as_echo_n "checking for $ac_word... " >&6; }
1.13040 -if ${ac_cv_prog_STRIP+:} false; then :
1.13041 - $as_echo_n "(cached) " >&6
1.13042 -else
1.13043 - if test -n "$STRIP"; then
1.13044 - ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
1.13045 -else
1.13046 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.13047 -for as_dir in $PATH
1.13048 -do
1.13049 - IFS=$as_save_IFS
1.13050 - test -z "$as_dir" && as_dir=.
1.13051 - for ac_exec_ext in '' $ac_executable_extensions; do
1.13052 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.13053 - ac_cv_prog_STRIP="$ac_tool_prefix$ac_prog"
1.13054 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.13055 - break 2
1.13056 - fi
1.13057 -done
1.13058 - done
1.13059 -IFS=$as_save_IFS
1.13060 -
1.13061 -fi
1.13062 -fi
1.13063 -STRIP=$ac_cv_prog_STRIP
1.13064 -if test -n "$STRIP"; then
1.13065 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
1.13066 -$as_echo "$STRIP" >&6; }
1.13067 -else
1.13068 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.13069 -$as_echo "no" >&6; }
1.13070 -fi
1.13071 -
1.13072 -
1.13073 - test -n "$STRIP" && break
1.13074 - done
1.13075 -fi
1.13076 -if test -z "$STRIP"; then
1.13077 - ac_ct_STRIP=$STRIP
1.13078 - for ac_prog in strip
1.13079 -do
1.13080 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.13081 -set dummy $ac_prog; ac_word=$2
1.13082 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.13083 -$as_echo_n "checking for $ac_word... " >&6; }
1.13084 -if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
1.13085 - $as_echo_n "(cached) " >&6
1.13086 -else
1.13087 - if test -n "$ac_ct_STRIP"; then
1.13088 - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
1.13089 -else
1.13090 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.13091 -for as_dir in $PATH
1.13092 -do
1.13093 - IFS=$as_save_IFS
1.13094 - test -z "$as_dir" && as_dir=.
1.13095 - for ac_exec_ext in '' $ac_executable_extensions; do
1.13096 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.13097 - ac_cv_prog_ac_ct_STRIP="$ac_prog"
1.13098 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.13099 - break 2
1.13100 - fi
1.13101 -done
1.13102 - done
1.13103 -IFS=$as_save_IFS
1.13104 -
1.13105 -fi
1.13106 -fi
1.13107 -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
1.13108 -if test -n "$ac_ct_STRIP"; then
1.13109 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
1.13110 -$as_echo "$ac_ct_STRIP" >&6; }
1.13111 -else
1.13112 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.13113 -$as_echo "no" >&6; }
1.13114 -fi
1.13115 -
1.13116 -
1.13117 - test -n "$ac_ct_STRIP" && break
1.13118 -done
1.13119 -
1.13120 - if test "x$ac_ct_STRIP" = x; then
1.13121 - STRIP=""
1.13122 - else
1.13123 - case $cross_compiling:$ac_tool_warned in
1.13124 -yes:)
1.13125 -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.13126 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.13127 -ac_tool_warned=yes ;;
1.13128 -esac
1.13129 - STRIP=$ac_ct_STRIP
1.13130 - fi
1.13131 -fi
1.13132 -
1.13133 - else
1.13134 - # The variable is set, but is it from the command line or the environment?
1.13135 -
1.13136 - # Try to remove the string !STRIP! from our list.
1.13137 - try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!STRIP!/}
1.13138 - if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.13139 - # If it failed, the variable was not from the command line. Ignore it,
1.13140 - # but warn the user (except for BASH, which is always set by the calling BASH).
1.13141 - if test "xSTRIP" != xBASH; then
1.13142 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of STRIP from the environment. Use command line variables instead." >&5
1.13143 -$as_echo "$as_me: WARNING: Ignoring value of STRIP from the environment. Use command line variables instead." >&2;}
1.13144 - fi
1.13145 - # Try to locate tool using the code snippet
1.13146 - if test -n "$ac_tool_prefix"; then
1.13147 - for ac_prog in strip
1.13148 - do
1.13149 - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.13150 -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.13151 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.13152 -$as_echo_n "checking for $ac_word... " >&6; }
1.13153 -if ${ac_cv_prog_STRIP+:} false; then :
1.13154 - $as_echo_n "(cached) " >&6
1.13155 -else
1.13156 - if test -n "$STRIP"; then
1.13157 - ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
1.13158 -else
1.13159 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.13160 -for as_dir in $PATH
1.13161 -do
1.13162 - IFS=$as_save_IFS
1.13163 - test -z "$as_dir" && as_dir=.
1.13164 - for ac_exec_ext in '' $ac_executable_extensions; do
1.13165 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.13166 - ac_cv_prog_STRIP="$ac_tool_prefix$ac_prog"
1.13167 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.13168 - break 2
1.13169 - fi
1.13170 -done
1.13171 - done
1.13172 -IFS=$as_save_IFS
1.13173 -
1.13174 -fi
1.13175 -fi
1.13176 -STRIP=$ac_cv_prog_STRIP
1.13177 -if test -n "$STRIP"; then
1.13178 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
1.13179 -$as_echo "$STRIP" >&6; }
1.13180 -else
1.13181 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.13182 -$as_echo "no" >&6; }
1.13183 -fi
1.13184 -
1.13185 -
1.13186 - test -n "$STRIP" && break
1.13187 - done
1.13188 -fi
1.13189 -if test -z "$STRIP"; then
1.13190 - ac_ct_STRIP=$STRIP
1.13191 - for ac_prog in strip
1.13192 -do
1.13193 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.13194 -set dummy $ac_prog; ac_word=$2
1.13195 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.13196 -$as_echo_n "checking for $ac_word... " >&6; }
1.13197 -if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
1.13198 - $as_echo_n "(cached) " >&6
1.13199 -else
1.13200 - if test -n "$ac_ct_STRIP"; then
1.13201 - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
1.13202 -else
1.13203 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.13204 -for as_dir in $PATH
1.13205 -do
1.13206 - IFS=$as_save_IFS
1.13207 - test -z "$as_dir" && as_dir=.
1.13208 - for ac_exec_ext in '' $ac_executable_extensions; do
1.13209 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.13210 - ac_cv_prog_ac_ct_STRIP="$ac_prog"
1.13211 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.13212 - break 2
1.13213 - fi
1.13214 -done
1.13215 - done
1.13216 -IFS=$as_save_IFS
1.13217 -
1.13218 -fi
1.13219 -fi
1.13220 -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
1.13221 -if test -n "$ac_ct_STRIP"; then
1.13222 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
1.13223 -$as_echo "$ac_ct_STRIP" >&6; }
1.13224 -else
1.13225 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.13226 -$as_echo "no" >&6; }
1.13227 -fi
1.13228 -
1.13229 -
1.13230 - test -n "$ac_ct_STRIP" && break
1.13231 -done
1.13232 -
1.13233 - if test "x$ac_ct_STRIP" = x; then
1.13234 - STRIP=""
1.13235 - else
1.13236 - case $cross_compiling:$ac_tool_warned in
1.13237 -yes:)
1.13238 -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.13239 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.13240 -ac_tool_warned=yes ;;
1.13241 -esac
1.13242 - STRIP=$ac_ct_STRIP
1.13243 - fi
1.13244 -fi
1.13245 -
1.13246 - else
1.13247 - # If it succeeded, then it was overridden by the user. We will use it
1.13248 - # for the tool.
1.13249 -
1.13250 - # First remove it from the list of overridden variables, so we can test
1.13251 - # for unknown variables in the end.
1.13252 - CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.13253 -
1.13254 - # Check if the provided tool contains a complete path.
1.13255 - tool_specified="$STRIP"
1.13256 - tool_basename="${tool_specified##*/}"
1.13257 - if test "x$tool_basename" = "x$tool_specified"; then
1.13258 - # A command without a complete path is provided, search $PATH.
1.13259 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool STRIP=$tool_basename" >&5
1.13260 -$as_echo "$as_me: Will search for user supplied tool STRIP=$tool_basename" >&6;}
1.13261 - # Extract the first word of "$tool_basename", so it can be a program name with args.
1.13262 -set dummy $tool_basename; ac_word=$2
1.13263 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.13264 -$as_echo_n "checking for $ac_word... " >&6; }
1.13265 -if ${ac_cv_path_STRIP+:} false; then :
1.13266 - $as_echo_n "(cached) " >&6
1.13267 -else
1.13268 - case $STRIP in
1.13269 - [\\/]* | ?:[\\/]*)
1.13270 - ac_cv_path_STRIP="$STRIP" # Let the user override the test with a path.
1.13271 - ;;
1.13272 - *)
1.13273 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.13274 -for as_dir in $PATH
1.13275 -do
1.13276 - IFS=$as_save_IFS
1.13277 - test -z "$as_dir" && as_dir=.
1.13278 - for ac_exec_ext in '' $ac_executable_extensions; do
1.13279 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.13280 - ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext"
1.13281 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.13282 - break 2
1.13283 - fi
1.13284 -done
1.13285 - done
1.13286 -IFS=$as_save_IFS
1.13287 -
1.13288 - ;;
1.13289 -esac
1.13290 -fi
1.13291 -STRIP=$ac_cv_path_STRIP
1.13292 -if test -n "$STRIP"; then
1.13293 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
1.13294 -$as_echo "$STRIP" >&6; }
1.13295 -else
1.13296 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.13297 -$as_echo "no" >&6; }
1.13298 -fi
1.13299 -
1.13300 -
1.13301 - if test "x$STRIP" = x; then
1.13302 - as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.13303 - fi
1.13304 - else
1.13305 - # Otherwise we believe it is a complete path. Use it as it is.
1.13306 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool STRIP=$tool_specified" >&5
1.13307 -$as_echo "$as_me: Will use user supplied tool STRIP=$tool_specified" >&6;}
1.13308 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for STRIP" >&5
1.13309 -$as_echo_n "checking for STRIP... " >&6; }
1.13310 - if test ! -x "$tool_specified"; then
1.13311 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.13312 -$as_echo "not found" >&6; }
1.13313 - as_fn_error $? "User supplied tool STRIP=$tool_specified does not exist or is not executable" "$LINENO" 5
1.13314 - fi
1.13315 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.13316 -$as_echo "$tool_specified" >&6; }
1.13317 - fi
1.13318 - fi
1.13319 - fi
1.13320 -
1.13321 -
1.13322 -
1.13323 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.13324 -
1.13325 - # First separate the path from the arguments. This will split at the first
1.13326 - # space.
1.13327 - complete="$STRIP"
1.13328 + BUILD_CXX="$new_complete"
1.13329 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CXX to \"$new_complete\"" >&5
1.13330 +$as_echo "$as_me: Rewriting BUILD_CXX to \"$new_complete\"" >&6;}
1.13331 + fi
1.13332 +
1.13333 +
1.13334 +
1.13335 + # Publish this variable in the help.
1.13336 +
1.13337 +
1.13338 + if test "x$BUILD_LD" = x; then
1.13339 + # The variable is not set by user, try to locate tool using the code snippet
1.13340 + for ac_prog in ld
1.13341 +do
1.13342 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.13343 +set dummy $ac_prog; ac_word=$2
1.13344 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.13345 +$as_echo_n "checking for $ac_word... " >&6; }
1.13346 +if ${ac_cv_path_BUILD_LD+:} false; then :
1.13347 + $as_echo_n "(cached) " >&6
1.13348 +else
1.13349 + case $BUILD_LD in
1.13350 + [\\/]* | ?:[\\/]*)
1.13351 + ac_cv_path_BUILD_LD="$BUILD_LD" # Let the user override the test with a path.
1.13352 + ;;
1.13353 + *)
1.13354 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.13355 +for as_dir in $PATH
1.13356 +do
1.13357 + IFS=$as_save_IFS
1.13358 + test -z "$as_dir" && as_dir=.
1.13359 + for ac_exec_ext in '' $ac_executable_extensions; do
1.13360 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.13361 + ac_cv_path_BUILD_LD="$as_dir/$ac_word$ac_exec_ext"
1.13362 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.13363 + break 2
1.13364 + fi
1.13365 +done
1.13366 + done
1.13367 +IFS=$as_save_IFS
1.13368 +
1.13369 + ;;
1.13370 +esac
1.13371 +fi
1.13372 +BUILD_LD=$ac_cv_path_BUILD_LD
1.13373 +if test -n "$BUILD_LD"; then
1.13374 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_LD" >&5
1.13375 +$as_echo "$BUILD_LD" >&6; }
1.13376 +else
1.13377 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.13378 +$as_echo "no" >&6; }
1.13379 +fi
1.13380 +
1.13381 +
1.13382 + test -n "$BUILD_LD" && break
1.13383 +done
1.13384 +
1.13385 + else
1.13386 + # The variable is set, but is it from the command line or the environment?
1.13387 +
1.13388 + # Try to remove the string !BUILD_LD! from our list.
1.13389 + try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!BUILD_LD!/}
1.13390 + if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.13391 + # If it failed, the variable was not from the command line. Ignore it,
1.13392 + # but warn the user (except for BASH, which is always set by the calling BASH).
1.13393 + if test "xBUILD_LD" != xBASH; then
1.13394 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of BUILD_LD from the environment. Use command line variables instead." >&5
1.13395 +$as_echo "$as_me: WARNING: Ignoring value of BUILD_LD from the environment. Use command line variables instead." >&2;}
1.13396 + fi
1.13397 + # Try to locate tool using the code snippet
1.13398 + for ac_prog in ld
1.13399 +do
1.13400 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.13401 +set dummy $ac_prog; ac_word=$2
1.13402 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.13403 +$as_echo_n "checking for $ac_word... " >&6; }
1.13404 +if ${ac_cv_path_BUILD_LD+:} false; then :
1.13405 + $as_echo_n "(cached) " >&6
1.13406 +else
1.13407 + case $BUILD_LD in
1.13408 + [\\/]* | ?:[\\/]*)
1.13409 + ac_cv_path_BUILD_LD="$BUILD_LD" # Let the user override the test with a path.
1.13410 + ;;
1.13411 + *)
1.13412 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.13413 +for as_dir in $PATH
1.13414 +do
1.13415 + IFS=$as_save_IFS
1.13416 + test -z "$as_dir" && as_dir=.
1.13417 + for ac_exec_ext in '' $ac_executable_extensions; do
1.13418 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.13419 + ac_cv_path_BUILD_LD="$as_dir/$ac_word$ac_exec_ext"
1.13420 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.13421 + break 2
1.13422 + fi
1.13423 +done
1.13424 + done
1.13425 +IFS=$as_save_IFS
1.13426 +
1.13427 + ;;
1.13428 +esac
1.13429 +fi
1.13430 +BUILD_LD=$ac_cv_path_BUILD_LD
1.13431 +if test -n "$BUILD_LD"; then
1.13432 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_LD" >&5
1.13433 +$as_echo "$BUILD_LD" >&6; }
1.13434 +else
1.13435 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.13436 +$as_echo "no" >&6; }
1.13437 +fi
1.13438 +
1.13439 +
1.13440 + test -n "$BUILD_LD" && break
1.13441 +done
1.13442 +
1.13443 + else
1.13444 + # If it succeeded, then it was overridden by the user. We will use it
1.13445 + # for the tool.
1.13446 +
1.13447 + # First remove it from the list of overridden variables, so we can test
1.13448 + # for unknown variables in the end.
1.13449 + CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.13450 +
1.13451 + # Check if the provided tool contains a complete path.
1.13452 + tool_specified="$BUILD_LD"
1.13453 + tool_basename="${tool_specified##*/}"
1.13454 + if test "x$tool_basename" = "x$tool_specified"; then
1.13455 + # A command without a complete path is provided, search $PATH.
1.13456 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool BUILD_LD=$tool_basename" >&5
1.13457 +$as_echo "$as_me: Will search for user supplied tool BUILD_LD=$tool_basename" >&6;}
1.13458 + # Extract the first word of "$tool_basename", so it can be a program name with args.
1.13459 +set dummy $tool_basename; ac_word=$2
1.13460 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.13461 +$as_echo_n "checking for $ac_word... " >&6; }
1.13462 +if ${ac_cv_path_BUILD_LD+:} false; then :
1.13463 + $as_echo_n "(cached) " >&6
1.13464 +else
1.13465 + case $BUILD_LD in
1.13466 + [\\/]* | ?:[\\/]*)
1.13467 + ac_cv_path_BUILD_LD="$BUILD_LD" # Let the user override the test with a path.
1.13468 + ;;
1.13469 + *)
1.13470 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.13471 +for as_dir in $PATH
1.13472 +do
1.13473 + IFS=$as_save_IFS
1.13474 + test -z "$as_dir" && as_dir=.
1.13475 + for ac_exec_ext in '' $ac_executable_extensions; do
1.13476 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.13477 + ac_cv_path_BUILD_LD="$as_dir/$ac_word$ac_exec_ext"
1.13478 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.13479 + break 2
1.13480 + fi
1.13481 +done
1.13482 + done
1.13483 +IFS=$as_save_IFS
1.13484 +
1.13485 + ;;
1.13486 +esac
1.13487 +fi
1.13488 +BUILD_LD=$ac_cv_path_BUILD_LD
1.13489 +if test -n "$BUILD_LD"; then
1.13490 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_LD" >&5
1.13491 +$as_echo "$BUILD_LD" >&6; }
1.13492 +else
1.13493 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.13494 +$as_echo "no" >&6; }
1.13495 +fi
1.13496 +
1.13497 +
1.13498 + if test "x$BUILD_LD" = x; then
1.13499 + as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.13500 + fi
1.13501 + else
1.13502 + # Otherwise we believe it is a complete path. Use it as it is.
1.13503 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool BUILD_LD=$tool_specified" >&5
1.13504 +$as_echo "$as_me: Will use user supplied tool BUILD_LD=$tool_specified" >&6;}
1.13505 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BUILD_LD" >&5
1.13506 +$as_echo_n "checking for BUILD_LD... " >&6; }
1.13507 + if test ! -x "$tool_specified"; then
1.13508 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.13509 +$as_echo "not found" >&6; }
1.13510 + as_fn_error $? "User supplied tool BUILD_LD=$tool_specified does not exist or is not executable" "$LINENO" 5
1.13511 + fi
1.13512 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.13513 +$as_echo "$tool_specified" >&6; }
1.13514 + fi
1.13515 + fi
1.13516 + fi
1.13517 +
1.13518 +
1.13519 +
1.13520 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.13521 +
1.13522 + # First separate the path from the arguments. This will split at the first
1.13523 + # space.
1.13524 + complete="$BUILD_LD"
1.13525 path="${complete%% *}"
1.13526 tmp="$complete EOL"
1.13527 arguments="${tmp#* }"
1.13528 @@ -37701,14 +38548,14 @@
1.13529 fi
1.13530 if test "x$new_path" = x; then
1.13531 # It's still not found. Now this is an unrecoverable error.
1.13532 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
1.13533 -$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
1.13534 - has_space=`$ECHO "$complete" | $GREP " "`
1.13535 - if test "x$has_space" != x; then
1.13536 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.13537 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.13538 - fi
1.13539 - as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.13540 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&5
1.13541 +$as_echo "$as_me: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&6;}
1.13542 + has_space=`$ECHO "$complete" | $GREP " "`
1.13543 + if test "x$has_space" != x; then
1.13544 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.13545 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.13546 + fi
1.13547 + as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5
1.13548 fi
1.13549 fi
1.13550
1.13551 @@ -37728,11 +38575,11 @@
1.13552 elif test -f "${new_path}.cmd"; then
1.13553 input_to_shortpath="${new_path}.cmd"
1.13554 else
1.13555 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$new_path\", is invalid." >&5
1.13556 -$as_echo "$as_me: The path of STRIP, which resolves as \"$new_path\", is invalid." >&6;}
1.13557 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$new_path\", is invalid." >&5
1.13558 +$as_echo "$as_me: The path of BUILD_LD, which resolves as \"$new_path\", is invalid." >&6;}
1.13559 { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.13560 $as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.13561 - as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.13562 + as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5
1.13563 fi
1.13564 else
1.13565 input_to_shortpath="$new_path"
1.13566 @@ -37779,7 +38626,7 @@
1.13567
1.13568 # First separate the path from the arguments. This will split at the first
1.13569 # space.
1.13570 - complete="$STRIP"
1.13571 + complete="$BUILD_LD"
1.13572 path="${complete%% *}"
1.13573 tmp="$complete EOL"
1.13574 arguments="${tmp#* }"
1.13575 @@ -37824,14 +38671,14 @@
1.13576
1.13577 if test "x$new_path" = x; then
1.13578 # It's still not found. Now this is an unrecoverable error.
1.13579 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
1.13580 -$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
1.13581 - has_space=`$ECHO "$complete" | $GREP " "`
1.13582 - if test "x$has_space" != x; then
1.13583 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.13584 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.13585 - fi
1.13586 - as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.13587 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&5
1.13588 +$as_echo "$as_me: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&6;}
1.13589 + has_space=`$ECHO "$complete" | $GREP " "`
1.13590 + if test "x$has_space" != x; then
1.13591 + { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.13592 +$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.13593 + fi
1.13594 + as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5
1.13595 fi
1.13596 fi
1.13597
1.13598 @@ -37877,7 +38724,7 @@
1.13599 # We're on a posix platform. Hooray! :)
1.13600 # First separate the path from the arguments. This will split at the first
1.13601 # space.
1.13602 - complete="$STRIP"
1.13603 + complete="$BUILD_LD"
1.13604 path="${complete%% *}"
1.13605 tmp="$complete EOL"
1.13606 arguments="${tmp#* }"
1.13607 @@ -37896,20 +38743,19 @@
1.13608 done
1.13609 IFS="$IFS_save"
1.13610 else
1.13611 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving STRIP (as $path) failed, using $path directly." >&5
1.13612 -$as_echo "$as_me: Resolving STRIP (as $path) failed, using $path directly." >&6;}
1.13613 + # This is an absolute path, we can use it without further modifications.
1.13614 new_path="$path"
1.13615 fi
1.13616
1.13617 if test "x$new_path" = x; then
1.13618 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
1.13619 -$as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
1.13620 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&5
1.13621 +$as_echo "$as_me: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&6;}
1.13622 has_space=`$ECHO "$complete" | $GREP " "`
1.13623 if test "x$has_space" != x; then
1.13624 { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.13625 $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.13626 fi
1.13627 - as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.13628 + as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5
1.13629 fi
1.13630 fi
1.13631
1.13632 @@ -37921,1158 +38767,601 @@
1.13633 fi
1.13634
1.13635 if test "x$complete" != "x$new_complete"; then
1.13636 - STRIP="$new_complete"
1.13637 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5
1.13638 -$as_echo "$as_me: Rewriting STRIP to \"$new_complete\"" >&6;}
1.13639 - fi
1.13640 -
1.13641 - fi
1.13642 -
1.13643 - # objcopy is used for moving debug symbols to separate files when
1.13644 - # full debug symbols are enabled.
1.13645 - if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
1.13646 -
1.13647 -
1.13648 - # Publish this variable in the help.
1.13649 -
1.13650 -
1.13651 - if test "x$OBJCOPY" = x; then
1.13652 - # The variable is not set by user, try to locate tool using the code snippet
1.13653 - if test -n "$ac_tool_prefix"; then
1.13654 - for ac_prog in gobjcopy objcopy
1.13655 - do
1.13656 - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.13657 -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.13658 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.13659 -$as_echo_n "checking for $ac_word... " >&6; }
1.13660 -if ${ac_cv_prog_OBJCOPY+:} false; then :
1.13661 - $as_echo_n "(cached) " >&6
1.13662 -else
1.13663 - if test -n "$OBJCOPY"; then
1.13664 - ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
1.13665 -else
1.13666 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.13667 -for as_dir in $PATH
1.13668 -do
1.13669 - IFS=$as_save_IFS
1.13670 - test -z "$as_dir" && as_dir=.
1.13671 - for ac_exec_ext in '' $ac_executable_extensions; do
1.13672 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.13673 - ac_cv_prog_OBJCOPY="$ac_tool_prefix$ac_prog"
1.13674 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.13675 - break 2
1.13676 - fi
1.13677 -done
1.13678 - done
1.13679 -IFS=$as_save_IFS
1.13680 -
1.13681 -fi
1.13682 -fi
1.13683 -OBJCOPY=$ac_cv_prog_OBJCOPY
1.13684 -if test -n "$OBJCOPY"; then
1.13685 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5
1.13686 -$as_echo "$OBJCOPY" >&6; }
1.13687 -else
1.13688 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.13689 -$as_echo "no" >&6; }
1.13690 -fi
1.13691 -
1.13692 -
1.13693 - test -n "$OBJCOPY" && break
1.13694 - done
1.13695 -fi
1.13696 -if test -z "$OBJCOPY"; then
1.13697 - ac_ct_OBJCOPY=$OBJCOPY
1.13698 - for ac_prog in gobjcopy objcopy
1.13699 -do
1.13700 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.13701 -set dummy $ac_prog; ac_word=$2
1.13702 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.13703 -$as_echo_n "checking for $ac_word... " >&6; }
1.13704 -if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
1.13705 - $as_echo_n "(cached) " >&6
1.13706 -else
1.13707 - if test -n "$ac_ct_OBJCOPY"; then
1.13708 - ac_cv_prog_ac_ct_OBJCOPY="$ac_ct_OBJCOPY" # Let the user override the test.
1.13709 -else
1.13710 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.13711 -for as_dir in $PATH
1.13712 -do
1.13713 - IFS=$as_save_IFS
1.13714 - test -z "$as_dir" && as_dir=.
1.13715 - for ac_exec_ext in '' $ac_executable_extensions; do
1.13716 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.13717 - ac_cv_prog_ac_ct_OBJCOPY="$ac_prog"
1.13718 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.13719 - break 2
1.13720 - fi
1.13721 -done
1.13722 - done
1.13723 -IFS=$as_save_IFS
1.13724 -
1.13725 -fi
1.13726 -fi
1.13727 -ac_ct_OBJCOPY=$ac_cv_prog_ac_ct_OBJCOPY
1.13728 -if test -n "$ac_ct_OBJCOPY"; then
1.13729 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJCOPY" >&5
1.13730 -$as_echo "$ac_ct_OBJCOPY" >&6; }
1.13731 -else
1.13732 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.13733 -$as_echo "no" >&6; }
1.13734 -fi
1.13735 -
1.13736 -
1.13737 - test -n "$ac_ct_OBJCOPY" && break
1.13738 -done
1.13739 -
1.13740 - if test "x$ac_ct_OBJCOPY" = x; then
1.13741 - OBJCOPY=""
1.13742 - else
1.13743 - case $cross_compiling:$ac_tool_warned in
1.13744 -yes:)
1.13745 -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.13746 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.13747 -ac_tool_warned=yes ;;
1.13748 -esac
1.13749 - OBJCOPY=$ac_ct_OBJCOPY
1.13750 - fi
1.13751 -fi
1.13752 -
1.13753 - else
1.13754 - # The variable is set, but is it from the command line or the environment?
1.13755 -
1.13756 - # Try to remove the string !OBJCOPY! from our list.
1.13757 - try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!OBJCOPY!/}
1.13758 - if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.13759 - # If it failed, the variable was not from the command line. Ignore it,
1.13760 - # but warn the user (except for BASH, which is always set by the calling BASH).
1.13761 - if test "xOBJCOPY" != xBASH; then
1.13762 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of OBJCOPY from the environment. Use command line variables instead." >&5
1.13763 -$as_echo "$as_me: WARNING: Ignoring value of OBJCOPY from the environment. Use command line variables instead." >&2;}
1.13764 - fi
1.13765 - # Try to locate tool using the code snippet
1.13766 - if test -n "$ac_tool_prefix"; then
1.13767 - for ac_prog in gobjcopy objcopy
1.13768 - do
1.13769 - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.13770 -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.13771 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.13772 -$as_echo_n "checking for $ac_word... " >&6; }
1.13773 -if ${ac_cv_prog_OBJCOPY+:} false; then :
1.13774 - $as_echo_n "(cached) " >&6
1.13775 -else
1.13776 - if test -n "$OBJCOPY"; then
1.13777 - ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
1.13778 -else
1.13779 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.13780 -for as_dir in $PATH
1.13781 -do
1.13782 - IFS=$as_save_IFS
1.13783 - test -z "$as_dir" && as_dir=.
1.13784 - for ac_exec_ext in '' $ac_executable_extensions; do
1.13785 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.13786 - ac_cv_prog_OBJCOPY="$ac_tool_prefix$ac_prog"
1.13787 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.13788 - break 2
1.13789 - fi
1.13790 -done
1.13791 - done
1.13792 -IFS=$as_save_IFS
1.13793 -
1.13794 -fi
1.13795 -fi
1.13796 -OBJCOPY=$ac_cv_prog_OBJCOPY
1.13797 -if test -n "$OBJCOPY"; then
1.13798 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5
1.13799 -$as_echo "$OBJCOPY" >&6; }
1.13800 -else
1.13801 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.13802 -$as_echo "no" >&6; }
1.13803 -fi
1.13804 -
1.13805 -
1.13806 - test -n "$OBJCOPY" && break
1.13807 - done
1.13808 -fi
1.13809 -if test -z "$OBJCOPY"; then
1.13810 - ac_ct_OBJCOPY=$OBJCOPY
1.13811 - for ac_prog in gobjcopy objcopy
1.13812 -do
1.13813 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.13814 -set dummy $ac_prog; ac_word=$2
1.13815 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.13816 -$as_echo_n "checking for $ac_word... " >&6; }
1.13817 -if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
1.13818 - $as_echo_n "(cached) " >&6
1.13819 -else
1.13820 - if test -n "$ac_ct_OBJCOPY"; then
1.13821 - ac_cv_prog_ac_ct_OBJCOPY="$ac_ct_OBJCOPY" # Let the user override the test.
1.13822 -else
1.13823 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.13824 -for as_dir in $PATH
1.13825 -do
1.13826 - IFS=$as_save_IFS
1.13827 - test -z "$as_dir" && as_dir=.
1.13828 - for ac_exec_ext in '' $ac_executable_extensions; do
1.13829 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.13830 - ac_cv_prog_ac_ct_OBJCOPY="$ac_prog"
1.13831 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.13832 - break 2
1.13833 - fi
1.13834 -done
1.13835 - done
1.13836 -IFS=$as_save_IFS
1.13837 -
1.13838 -fi
1.13839 -fi
1.13840 -ac_ct_OBJCOPY=$ac_cv_prog_ac_ct_OBJCOPY
1.13841 -if test -n "$ac_ct_OBJCOPY"; then
1.13842 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJCOPY" >&5
1.13843 -$as_echo "$ac_ct_OBJCOPY" >&6; }
1.13844 -else
1.13845 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.13846 -$as_echo "no" >&6; }
1.13847 -fi
1.13848 -
1.13849 -
1.13850 - test -n "$ac_ct_OBJCOPY" && break
1.13851 -done
1.13852 -
1.13853 - if test "x$ac_ct_OBJCOPY" = x; then
1.13854 - OBJCOPY=""
1.13855 - else
1.13856 - case $cross_compiling:$ac_tool_warned in
1.13857 -yes:)
1.13858 -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.13859 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.13860 -ac_tool_warned=yes ;;
1.13861 -esac
1.13862 - OBJCOPY=$ac_ct_OBJCOPY
1.13863 - fi
1.13864 -fi
1.13865 -
1.13866 - else
1.13867 - # If it succeeded, then it was overridden by the user. We will use it
1.13868 - # for the tool.
1.13869 -
1.13870 - # First remove it from the list of overridden variables, so we can test
1.13871 - # for unknown variables in the end.
1.13872 - CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.13873 -
1.13874 - # Check if the provided tool contains a complete path.
1.13875 - tool_specified="$OBJCOPY"
1.13876 - tool_basename="${tool_specified##*/}"
1.13877 - if test "x$tool_basename" = "x$tool_specified"; then
1.13878 - # A command without a complete path is provided, search $PATH.
1.13879 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool OBJCOPY=$tool_basename" >&5
1.13880 -$as_echo "$as_me: Will search for user supplied tool OBJCOPY=$tool_basename" >&6;}
1.13881 - # Extract the first word of "$tool_basename", so it can be a program name with args.
1.13882 -set dummy $tool_basename; ac_word=$2
1.13883 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.13884 -$as_echo_n "checking for $ac_word... " >&6; }
1.13885 -if ${ac_cv_path_OBJCOPY+:} false; then :
1.13886 - $as_echo_n "(cached) " >&6
1.13887 -else
1.13888 - case $OBJCOPY in
1.13889 - [\\/]* | ?:[\\/]*)
1.13890 - ac_cv_path_OBJCOPY="$OBJCOPY" # Let the user override the test with a path.
1.13891 - ;;
1.13892 - *)
1.13893 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.13894 -for as_dir in $PATH
1.13895 -do
1.13896 - IFS=$as_save_IFS
1.13897 - test -z "$as_dir" && as_dir=.
1.13898 - for ac_exec_ext in '' $ac_executable_extensions; do
1.13899 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.13900 - ac_cv_path_OBJCOPY="$as_dir/$ac_word$ac_exec_ext"
1.13901 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.13902 - break 2
1.13903 - fi
1.13904 -done
1.13905 - done
1.13906 -IFS=$as_save_IFS
1.13907 -
1.13908 - ;;
1.13909 -esac
1.13910 -fi
1.13911 -OBJCOPY=$ac_cv_path_OBJCOPY
1.13912 -if test -n "$OBJCOPY"; then
1.13913 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5
1.13914 -$as_echo "$OBJCOPY" >&6; }
1.13915 -else
1.13916 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.13917 -$as_echo "no" >&6; }
1.13918 -fi
1.13919 -
1.13920 -
1.13921 - if test "x$OBJCOPY" = x; then
1.13922 - as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.13923 - fi
1.13924 - else
1.13925 - # Otherwise we believe it is a complete path. Use it as it is.
1.13926 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool OBJCOPY=$tool_specified" >&5
1.13927 -$as_echo "$as_me: Will use user supplied tool OBJCOPY=$tool_specified" >&6;}
1.13928 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OBJCOPY" >&5
1.13929 -$as_echo_n "checking for OBJCOPY... " >&6; }
1.13930 - if test ! -x "$tool_specified"; then
1.13931 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.13932 -$as_echo "not found" >&6; }
1.13933 - as_fn_error $? "User supplied tool OBJCOPY=$tool_specified does not exist or is not executable" "$LINENO" 5
1.13934 - fi
1.13935 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.13936 -$as_echo "$tool_specified" >&6; }
1.13937 - fi
1.13938 - fi
1.13939 - fi
1.13940 -
1.13941 -
1.13942 - # Only call fixup if objcopy was found.
1.13943 - if test -n "$OBJCOPY"; then
1.13944 -
1.13945 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.13946 -
1.13947 - # First separate the path from the arguments. This will split at the first
1.13948 - # space.
1.13949 - complete="$OBJCOPY"
1.13950 - path="${complete%% *}"
1.13951 - tmp="$complete EOL"
1.13952 - arguments="${tmp#* }"
1.13953 -
1.13954 - # Input might be given as Windows format, start by converting to
1.13955 - # unix format.
1.13956 - new_path=`$CYGPATH -u "$path"`
1.13957 -
1.13958 - # Now try to locate executable using which
1.13959 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.13960 - # bat and cmd files are not always considered executable in cygwin causing which
1.13961 - # to not find them
1.13962 - if test "x$new_path" = x \
1.13963 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.13964 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.13965 - new_path=`$CYGPATH -u "$path"`
1.13966 - fi
1.13967 - if test "x$new_path" = x; then
1.13968 - # Oops. Which didn't find the executable.
1.13969 - # The splitting of arguments from the executable at a space might have been incorrect,
1.13970 - # since paths with space are more likely in Windows. Give it another try with the whole
1.13971 - # argument.
1.13972 - path="$complete"
1.13973 - arguments="EOL"
1.13974 - new_path=`$CYGPATH -u "$path"`
1.13975 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.13976 - # bat and cmd files are not always considered executable in cygwin causing which
1.13977 - # to not find them
1.13978 - if test "x$new_path" = x \
1.13979 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.13980 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.13981 - new_path=`$CYGPATH -u "$path"`
1.13982 - fi
1.13983 - if test "x$new_path" = x; then
1.13984 - # It's still not found. Now this is an unrecoverable error.
1.13985 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&5
1.13986 -$as_echo "$as_me: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&6;}
1.13987 - has_space=`$ECHO "$complete" | $GREP " "`
1.13988 - if test "x$has_space" != x; then
1.13989 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.13990 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.13991 - fi
1.13992 - as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5
1.13993 - fi
1.13994 - fi
1.13995 -
1.13996 - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.13997 - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.13998 - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.13999 - # "foo.exe" is OK but "foo" is an error.
1.14000 - #
1.14001 - # This test is therefore slightly more accurate than "test -f" to check for file presence.
1.14002 - # It is also a way to make sure we got the proper file name for the real test later on.
1.14003 - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.14004 - if test "x$test_shortpath" = x; then
1.14005 - # Short path failed, file does not exist as specified.
1.14006 - # Try adding .exe or .cmd
1.14007 - if test -f "${new_path}.exe"; then
1.14008 - input_to_shortpath="${new_path}.exe"
1.14009 - elif test -f "${new_path}.cmd"; then
1.14010 - input_to_shortpath="${new_path}.cmd"
1.14011 - else
1.14012 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$new_path\", is invalid." >&5
1.14013 -$as_echo "$as_me: The path of OBJCOPY, which resolves as \"$new_path\", is invalid." >&6;}
1.14014 - { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.14015 -$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.14016 - as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5
1.14017 - fi
1.14018 - else
1.14019 - input_to_shortpath="$new_path"
1.14020 - fi
1.14021 -
1.14022 - # Call helper function which possibly converts this using DOS-style short mode.
1.14023 - # If so, the updated path is stored in $new_path.
1.14024 - new_path="$input_to_shortpath"
1.14025 -
1.14026 - input_path="$input_to_shortpath"
1.14027 - # Check if we need to convert this using DOS-style short mode. If the path
1.14028 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.14029 - # take no chances and rewrite it.
1.14030 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.14031 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.14032 - if test "x$has_forbidden_chars" != x; then
1.14033 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.14034 - shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.14035 - path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.14036 - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.14037 - # Going to short mode and back again did indeed matter. Since short mode is
1.14038 - # case insensitive, let's make it lowercase to improve readability.
1.14039 - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.14040 - # Now convert it back to Unix-stile (cygpath)
1.14041 - input_path=`$CYGPATH -u "$shortmode_path"`
1.14042 - new_path="$input_path"
1.14043 - fi
1.14044 - fi
1.14045 -
1.14046 - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.14047 - if test "x$test_cygdrive_prefix" = x; then
1.14048 - # As a simple fix, exclude /usr/bin since it's not a real path.
1.14049 - if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
1.14050 - # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.14051 - # a path prefixed by /cygdrive for fixpath to work.
1.14052 - new_path="$CYGWIN_ROOT_PATH$input_path"
1.14053 - fi
1.14054 - fi
1.14055 -
1.14056 - # remove trailing .exe if any
1.14057 - new_path="${new_path/%.exe/}"
1.14058 -
1.14059 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.14060 -
1.14061 - # First separate the path from the arguments. This will split at the first
1.14062 - # space.
1.14063 - complete="$OBJCOPY"
1.14064 - path="${complete%% *}"
1.14065 - tmp="$complete EOL"
1.14066 - arguments="${tmp#* }"
1.14067 -
1.14068 - # Input might be given as Windows format, start by converting to
1.14069 - # unix format.
1.14070 - new_path="$path"
1.14071 -
1.14072 - windows_path="$new_path"
1.14073 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.14074 - unix_path=`$CYGPATH -u "$windows_path"`
1.14075 - new_path="$unix_path"
1.14076 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.14077 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.14078 - new_path="$unix_path"
1.14079 - fi
1.14080 -
1.14081 -
1.14082 - # Now try to locate executable using which
1.14083 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.14084 -
1.14085 - if test "x$new_path" = x; then
1.14086 - # Oops. Which didn't find the executable.
1.14087 - # The splitting of arguments from the executable at a space might have been incorrect,
1.14088 - # since paths with space are more likely in Windows. Give it another try with the whole
1.14089 - # argument.
1.14090 - path="$complete"
1.14091 - arguments="EOL"
1.14092 - new_path="$path"
1.14093 -
1.14094 - windows_path="$new_path"
1.14095 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.14096 - unix_path=`$CYGPATH -u "$windows_path"`
1.14097 - new_path="$unix_path"
1.14098 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.14099 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.14100 - new_path="$unix_path"
1.14101 - fi
1.14102 -
1.14103 -
1.14104 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.14105 -
1.14106 - if test "x$new_path" = x; then
1.14107 - # It's still not found. Now this is an unrecoverable error.
1.14108 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&5
1.14109 -$as_echo "$as_me: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&6;}
1.14110 - has_space=`$ECHO "$complete" | $GREP " "`
1.14111 - if test "x$has_space" != x; then
1.14112 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.14113 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.14114 - fi
1.14115 - as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5
1.14116 - fi
1.14117 - fi
1.14118 -
1.14119 - # Now new_path has a complete unix path to the binary
1.14120 - if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
1.14121 - # Keep paths in /bin as-is, but remove trailing .exe if any
1.14122 - new_path="${new_path/%.exe/}"
1.14123 - # Do not save /bin paths to all_fixpath_prefixes!
1.14124 - else
1.14125 - # Not in mixed or Windows style, start by that.
1.14126 - new_path=`cmd //c echo $new_path`
1.14127 -
1.14128 - input_path="$new_path"
1.14129 - # Check if we need to convert this using DOS-style short mode. If the path
1.14130 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.14131 - # take no chances and rewrite it.
1.14132 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.14133 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.14134 - if test "x$has_forbidden_chars" != x; then
1.14135 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.14136 - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.14137 - fi
1.14138 -
1.14139 - # Output is in $new_path
1.14140 -
1.14141 - windows_path="$new_path"
1.14142 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.14143 - unix_path=`$CYGPATH -u "$windows_path"`
1.14144 - new_path="$unix_path"
1.14145 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.14146 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.14147 - new_path="$unix_path"
1.14148 - fi
1.14149 -
1.14150 - # remove trailing .exe if any
1.14151 - new_path="${new_path/%.exe/}"
1.14152 -
1.14153 - # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.14154 - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.14155 - fi
1.14156 -
1.14157 - else
1.14158 - # We're on a posix platform. Hooray! :)
1.14159 - # First separate the path from the arguments. This will split at the first
1.14160 - # space.
1.14161 - complete="$OBJCOPY"
1.14162 - path="${complete%% *}"
1.14163 - tmp="$complete EOL"
1.14164 - arguments="${tmp#* }"
1.14165 -
1.14166 - # Cannot rely on the command "which" here since it doesn't always work.
1.14167 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.14168 - if test -z "$is_absolute_path"; then
1.14169 - # Path to executable is not absolute. Find it.
1.14170 - IFS_save="$IFS"
1.14171 - IFS=:
1.14172 - for p in $PATH; do
1.14173 - if test -f "$p/$path" && test -x "$p/$path"; then
1.14174 - new_path="$p/$path"
1.14175 - break
1.14176 - fi
1.14177 - done
1.14178 - IFS="$IFS_save"
1.14179 - else
1.14180 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJCOPY (as $path) failed, using $path directly." >&5
1.14181 -$as_echo "$as_me: Resolving OBJCOPY (as $path) failed, using $path directly." >&6;}
1.14182 - new_path="$path"
1.14183 - fi
1.14184 -
1.14185 - if test "x$new_path" = x; then
1.14186 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&5
1.14187 -$as_echo "$as_me: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&6;}
1.14188 - has_space=`$ECHO "$complete" | $GREP " "`
1.14189 - if test "x$has_space" != x; then
1.14190 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.14191 -$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.14192 - fi
1.14193 - as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5
1.14194 - fi
1.14195 - fi
1.14196 -
1.14197 - # Now join together the path and the arguments once again
1.14198 - if test "x$arguments" != xEOL; then
1.14199 - new_complete="$new_path ${arguments% *}"
1.14200 - else
1.14201 - new_complete="$new_path"
1.14202 - fi
1.14203 -
1.14204 - if test "x$complete" != "x$new_complete"; then
1.14205 - OBJCOPY="$new_complete"
1.14206 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJCOPY to \"$new_complete\"" >&5
1.14207 -$as_echo "$as_me: Rewriting OBJCOPY to \"$new_complete\"" >&6;}
1.14208 - fi
1.14209 -
1.14210 - fi
1.14211 - fi
1.14212 -
1.14213 -
1.14214 -
1.14215 - # Publish this variable in the help.
1.14216 -
1.14217 -
1.14218 - if test "x$OBJDUMP" = x; then
1.14219 - # The variable is not set by user, try to locate tool using the code snippet
1.14220 - if test -n "$ac_tool_prefix"; then
1.14221 - for ac_prog in gobjdump objdump
1.14222 - do
1.14223 - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.14224 -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.14225 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.14226 -$as_echo_n "checking for $ac_word... " >&6; }
1.14227 -if ${ac_cv_prog_OBJDUMP+:} false; then :
1.14228 - $as_echo_n "(cached) " >&6
1.14229 -else
1.14230 - if test -n "$OBJDUMP"; then
1.14231 - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
1.14232 -else
1.14233 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.14234 -for as_dir in $PATH
1.14235 -do
1.14236 - IFS=$as_save_IFS
1.14237 - test -z "$as_dir" && as_dir=.
1.14238 - for ac_exec_ext in '' $ac_executable_extensions; do
1.14239 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.14240 - ac_cv_prog_OBJDUMP="$ac_tool_prefix$ac_prog"
1.14241 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.14242 - break 2
1.14243 - fi
1.14244 -done
1.14245 - done
1.14246 -IFS=$as_save_IFS
1.14247 -
1.14248 -fi
1.14249 -fi
1.14250 -OBJDUMP=$ac_cv_prog_OBJDUMP
1.14251 -if test -n "$OBJDUMP"; then
1.14252 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
1.14253 -$as_echo "$OBJDUMP" >&6; }
1.14254 -else
1.14255 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.14256 -$as_echo "no" >&6; }
1.14257 -fi
1.14258 -
1.14259 -
1.14260 - test -n "$OBJDUMP" && break
1.14261 - done
1.14262 -fi
1.14263 -if test -z "$OBJDUMP"; then
1.14264 - ac_ct_OBJDUMP=$OBJDUMP
1.14265 - for ac_prog in gobjdump objdump
1.14266 -do
1.14267 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.14268 -set dummy $ac_prog; ac_word=$2
1.14269 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.14270 -$as_echo_n "checking for $ac_word... " >&6; }
1.14271 -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
1.14272 - $as_echo_n "(cached) " >&6
1.14273 -else
1.14274 - if test -n "$ac_ct_OBJDUMP"; then
1.14275 - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
1.14276 -else
1.14277 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.14278 -for as_dir in $PATH
1.14279 -do
1.14280 - IFS=$as_save_IFS
1.14281 - test -z "$as_dir" && as_dir=.
1.14282 - for ac_exec_ext in '' $ac_executable_extensions; do
1.14283 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.14284 - ac_cv_prog_ac_ct_OBJDUMP="$ac_prog"
1.14285 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.14286 - break 2
1.14287 - fi
1.14288 -done
1.14289 - done
1.14290 -IFS=$as_save_IFS
1.14291 -
1.14292 -fi
1.14293 -fi
1.14294 -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
1.14295 -if test -n "$ac_ct_OBJDUMP"; then
1.14296 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
1.14297 -$as_echo "$ac_ct_OBJDUMP" >&6; }
1.14298 -else
1.14299 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.14300 -$as_echo "no" >&6; }
1.14301 -fi
1.14302 -
1.14303 -
1.14304 - test -n "$ac_ct_OBJDUMP" && break
1.14305 -done
1.14306 -
1.14307 - if test "x$ac_ct_OBJDUMP" = x; then
1.14308 - OBJDUMP=""
1.14309 - else
1.14310 - case $cross_compiling:$ac_tool_warned in
1.14311 -yes:)
1.14312 -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.14313 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.14314 -ac_tool_warned=yes ;;
1.14315 -esac
1.14316 - OBJDUMP=$ac_ct_OBJDUMP
1.14317 - fi
1.14318 -fi
1.14319 -
1.14320 - else
1.14321 - # The variable is set, but is it from the command line or the environment?
1.14322 -
1.14323 - # Try to remove the string !OBJDUMP! from our list.
1.14324 - try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!OBJDUMP!/}
1.14325 - if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.14326 - # If it failed, the variable was not from the command line. Ignore it,
1.14327 - # but warn the user (except for BASH, which is always set by the calling BASH).
1.14328 - if test "xOBJDUMP" != xBASH; then
1.14329 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of OBJDUMP from the environment. Use command line variables instead." >&5
1.14330 -$as_echo "$as_me: WARNING: Ignoring value of OBJDUMP from the environment. Use command line variables instead." >&2;}
1.14331 - fi
1.14332 - # Try to locate tool using the code snippet
1.14333 - if test -n "$ac_tool_prefix"; then
1.14334 - for ac_prog in gobjdump objdump
1.14335 - do
1.14336 - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1.14337 -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.14338 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.14339 -$as_echo_n "checking for $ac_word... " >&6; }
1.14340 -if ${ac_cv_prog_OBJDUMP+:} false; then :
1.14341 - $as_echo_n "(cached) " >&6
1.14342 -else
1.14343 - if test -n "$OBJDUMP"; then
1.14344 - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
1.14345 -else
1.14346 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.14347 -for as_dir in $PATH
1.14348 -do
1.14349 - IFS=$as_save_IFS
1.14350 - test -z "$as_dir" && as_dir=.
1.14351 - for ac_exec_ext in '' $ac_executable_extensions; do
1.14352 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.14353 - ac_cv_prog_OBJDUMP="$ac_tool_prefix$ac_prog"
1.14354 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.14355 - break 2
1.14356 - fi
1.14357 -done
1.14358 - done
1.14359 -IFS=$as_save_IFS
1.14360 -
1.14361 -fi
1.14362 -fi
1.14363 -OBJDUMP=$ac_cv_prog_OBJDUMP
1.14364 -if test -n "$OBJDUMP"; then
1.14365 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
1.14366 -$as_echo "$OBJDUMP" >&6; }
1.14367 -else
1.14368 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.14369 -$as_echo "no" >&6; }
1.14370 -fi
1.14371 -
1.14372 -
1.14373 - test -n "$OBJDUMP" && break
1.14374 - done
1.14375 -fi
1.14376 -if test -z "$OBJDUMP"; then
1.14377 - ac_ct_OBJDUMP=$OBJDUMP
1.14378 - for ac_prog in gobjdump objdump
1.14379 -do
1.14380 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.14381 -set dummy $ac_prog; ac_word=$2
1.14382 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.14383 -$as_echo_n "checking for $ac_word... " >&6; }
1.14384 -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
1.14385 - $as_echo_n "(cached) " >&6
1.14386 -else
1.14387 - if test -n "$ac_ct_OBJDUMP"; then
1.14388 - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
1.14389 -else
1.14390 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.14391 -for as_dir in $PATH
1.14392 -do
1.14393 - IFS=$as_save_IFS
1.14394 - test -z "$as_dir" && as_dir=.
1.14395 - for ac_exec_ext in '' $ac_executable_extensions; do
1.14396 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.14397 - ac_cv_prog_ac_ct_OBJDUMP="$ac_prog"
1.14398 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.14399 - break 2
1.14400 - fi
1.14401 -done
1.14402 - done
1.14403 -IFS=$as_save_IFS
1.14404 -
1.14405 -fi
1.14406 -fi
1.14407 -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
1.14408 -if test -n "$ac_ct_OBJDUMP"; then
1.14409 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
1.14410 -$as_echo "$ac_ct_OBJDUMP" >&6; }
1.14411 -else
1.14412 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.14413 -$as_echo "no" >&6; }
1.14414 -fi
1.14415 -
1.14416 -
1.14417 - test -n "$ac_ct_OBJDUMP" && break
1.14418 -done
1.14419 -
1.14420 - if test "x$ac_ct_OBJDUMP" = x; then
1.14421 - OBJDUMP=""
1.14422 - else
1.14423 - case $cross_compiling:$ac_tool_warned in
1.14424 -yes:)
1.14425 -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1.14426 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1.14427 -ac_tool_warned=yes ;;
1.14428 -esac
1.14429 - OBJDUMP=$ac_ct_OBJDUMP
1.14430 - fi
1.14431 -fi
1.14432 -
1.14433 - else
1.14434 - # If it succeeded, then it was overridden by the user. We will use it
1.14435 - # for the tool.
1.14436 -
1.14437 - # First remove it from the list of overridden variables, so we can test
1.14438 - # for unknown variables in the end.
1.14439 - CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.14440 -
1.14441 - # Check if the provided tool contains a complete path.
1.14442 - tool_specified="$OBJDUMP"
1.14443 - tool_basename="${tool_specified##*/}"
1.14444 - if test "x$tool_basename" = "x$tool_specified"; then
1.14445 - # A command without a complete path is provided, search $PATH.
1.14446 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool OBJDUMP=$tool_basename" >&5
1.14447 -$as_echo "$as_me: Will search for user supplied tool OBJDUMP=$tool_basename" >&6;}
1.14448 - # Extract the first word of "$tool_basename", so it can be a program name with args.
1.14449 -set dummy $tool_basename; ac_word=$2
1.14450 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.14451 -$as_echo_n "checking for $ac_word... " >&6; }
1.14452 -if ${ac_cv_path_OBJDUMP+:} false; then :
1.14453 - $as_echo_n "(cached) " >&6
1.14454 -else
1.14455 - case $OBJDUMP in
1.14456 - [\\/]* | ?:[\\/]*)
1.14457 - ac_cv_path_OBJDUMP="$OBJDUMP" # Let the user override the test with a path.
1.14458 - ;;
1.14459 - *)
1.14460 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.14461 -for as_dir in $PATH
1.14462 -do
1.14463 - IFS=$as_save_IFS
1.14464 - test -z "$as_dir" && as_dir=.
1.14465 - for ac_exec_ext in '' $ac_executable_extensions; do
1.14466 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.14467 - ac_cv_path_OBJDUMP="$as_dir/$ac_word$ac_exec_ext"
1.14468 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.14469 - break 2
1.14470 - fi
1.14471 -done
1.14472 - done
1.14473 -IFS=$as_save_IFS
1.14474 -
1.14475 - ;;
1.14476 -esac
1.14477 -fi
1.14478 -OBJDUMP=$ac_cv_path_OBJDUMP
1.14479 -if test -n "$OBJDUMP"; then
1.14480 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
1.14481 -$as_echo "$OBJDUMP" >&6; }
1.14482 -else
1.14483 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.14484 -$as_echo "no" >&6; }
1.14485 -fi
1.14486 -
1.14487 -
1.14488 - if test "x$OBJDUMP" = x; then
1.14489 - as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.14490 - fi
1.14491 - else
1.14492 - # Otherwise we believe it is a complete path. Use it as it is.
1.14493 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool OBJDUMP=$tool_specified" >&5
1.14494 -$as_echo "$as_me: Will use user supplied tool OBJDUMP=$tool_specified" >&6;}
1.14495 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OBJDUMP" >&5
1.14496 -$as_echo_n "checking for OBJDUMP... " >&6; }
1.14497 - if test ! -x "$tool_specified"; then
1.14498 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.14499 -$as_echo "not found" >&6; }
1.14500 - as_fn_error $? "User supplied tool OBJDUMP=$tool_specified does not exist or is not executable" "$LINENO" 5
1.14501 - fi
1.14502 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.14503 -$as_echo "$tool_specified" >&6; }
1.14504 - fi
1.14505 - fi
1.14506 - fi
1.14507 -
1.14508 -
1.14509 - if test "x$OBJDUMP" != x; then
1.14510 - # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE bails if argument is missing.
1.14511 -
1.14512 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.14513 -
1.14514 - # First separate the path from the arguments. This will split at the first
1.14515 - # space.
1.14516 - complete="$OBJDUMP"
1.14517 - path="${complete%% *}"
1.14518 - tmp="$complete EOL"
1.14519 - arguments="${tmp#* }"
1.14520 -
1.14521 - # Input might be given as Windows format, start by converting to
1.14522 - # unix format.
1.14523 - new_path=`$CYGPATH -u "$path"`
1.14524 -
1.14525 - # Now try to locate executable using which
1.14526 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.14527 - # bat and cmd files are not always considered executable in cygwin causing which
1.14528 - # to not find them
1.14529 - if test "x$new_path" = x \
1.14530 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.14531 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.14532 - new_path=`$CYGPATH -u "$path"`
1.14533 - fi
1.14534 - if test "x$new_path" = x; then
1.14535 - # Oops. Which didn't find the executable.
1.14536 - # The splitting of arguments from the executable at a space might have been incorrect,
1.14537 - # since paths with space are more likely in Windows. Give it another try with the whole
1.14538 - # argument.
1.14539 - path="$complete"
1.14540 - arguments="EOL"
1.14541 - new_path=`$CYGPATH -u "$path"`
1.14542 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.14543 - # bat and cmd files are not always considered executable in cygwin causing which
1.14544 - # to not find them
1.14545 - if test "x$new_path" = x \
1.14546 - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.14547 - && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.14548 - new_path=`$CYGPATH -u "$path"`
1.14549 - fi
1.14550 - if test "x$new_path" = x; then
1.14551 - # It's still not found. Now this is an unrecoverable error.
1.14552 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&5
1.14553 -$as_echo "$as_me: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&6;}
1.14554 - has_space=`$ECHO "$complete" | $GREP " "`
1.14555 - if test "x$has_space" != x; then
1.14556 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.14557 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.14558 - fi
1.14559 - as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5
1.14560 - fi
1.14561 - fi
1.14562 -
1.14563 - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.14564 - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.14565 - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.14566 - # "foo.exe" is OK but "foo" is an error.
1.14567 - #
1.14568 - # This test is therefore slightly more accurate than "test -f" to check for file presence.
1.14569 - # It is also a way to make sure we got the proper file name for the real test later on.
1.14570 - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.14571 - if test "x$test_shortpath" = x; then
1.14572 - # Short path failed, file does not exist as specified.
1.14573 - # Try adding .exe or .cmd
1.14574 - if test -f "${new_path}.exe"; then
1.14575 - input_to_shortpath="${new_path}.exe"
1.14576 - elif test -f "${new_path}.cmd"; then
1.14577 - input_to_shortpath="${new_path}.cmd"
1.14578 - else
1.14579 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$new_path\", is invalid." >&5
1.14580 -$as_echo "$as_me: The path of OBJDUMP, which resolves as \"$new_path\", is invalid." >&6;}
1.14581 - { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5
1.14582 -$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;}
1.14583 - as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5
1.14584 - fi
1.14585 - else
1.14586 - input_to_shortpath="$new_path"
1.14587 - fi
1.14588 -
1.14589 - # Call helper function which possibly converts this using DOS-style short mode.
1.14590 - # If so, the updated path is stored in $new_path.
1.14591 - new_path="$input_to_shortpath"
1.14592 -
1.14593 - input_path="$input_to_shortpath"
1.14594 - # Check if we need to convert this using DOS-style short mode. If the path
1.14595 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.14596 - # take no chances and rewrite it.
1.14597 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.14598 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.14599 - if test "x$has_forbidden_chars" != x; then
1.14600 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.14601 - shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.14602 - path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.14603 - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.14604 - # Going to short mode and back again did indeed matter. Since short mode is
1.14605 - # case insensitive, let's make it lowercase to improve readability.
1.14606 - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.14607 - # Now convert it back to Unix-stile (cygpath)
1.14608 - input_path=`$CYGPATH -u "$shortmode_path"`
1.14609 - new_path="$input_path"
1.14610 - fi
1.14611 - fi
1.14612 -
1.14613 - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.14614 - if test "x$test_cygdrive_prefix" = x; then
1.14615 - # As a simple fix, exclude /usr/bin since it's not a real path.
1.14616 - if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then
1.14617 - # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.14618 - # a path prefixed by /cygdrive for fixpath to work.
1.14619 - new_path="$CYGWIN_ROOT_PATH$input_path"
1.14620 - fi
1.14621 - fi
1.14622 -
1.14623 - # remove trailing .exe if any
1.14624 - new_path="${new_path/%.exe/}"
1.14625 -
1.14626 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.14627 -
1.14628 - # First separate the path from the arguments. This will split at the first
1.14629 - # space.
1.14630 - complete="$OBJDUMP"
1.14631 - path="${complete%% *}"
1.14632 - tmp="$complete EOL"
1.14633 - arguments="${tmp#* }"
1.14634 -
1.14635 - # Input might be given as Windows format, start by converting to
1.14636 - # unix format.
1.14637 - new_path="$path"
1.14638 -
1.14639 - windows_path="$new_path"
1.14640 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.14641 - unix_path=`$CYGPATH -u "$windows_path"`
1.14642 - new_path="$unix_path"
1.14643 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.14644 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.14645 - new_path="$unix_path"
1.14646 - fi
1.14647 -
1.14648 -
1.14649 - # Now try to locate executable using which
1.14650 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.14651 -
1.14652 - if test "x$new_path" = x; then
1.14653 - # Oops. Which didn't find the executable.
1.14654 - # The splitting of arguments from the executable at a space might have been incorrect,
1.14655 - # since paths with space are more likely in Windows. Give it another try with the whole
1.14656 - # argument.
1.14657 - path="$complete"
1.14658 - arguments="EOL"
1.14659 - new_path="$path"
1.14660 -
1.14661 - windows_path="$new_path"
1.14662 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.14663 - unix_path=`$CYGPATH -u "$windows_path"`
1.14664 - new_path="$unix_path"
1.14665 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.14666 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.14667 - new_path="$unix_path"
1.14668 - fi
1.14669 -
1.14670 -
1.14671 - new_path=`$WHICH "$new_path" 2> /dev/null`
1.14672 -
1.14673 - if test "x$new_path" = x; then
1.14674 - # It's still not found. Now this is an unrecoverable error.
1.14675 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&5
1.14676 -$as_echo "$as_me: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&6;}
1.14677 - has_space=`$ECHO "$complete" | $GREP " "`
1.14678 - if test "x$has_space" != x; then
1.14679 - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5
1.14680 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;}
1.14681 - fi
1.14682 - as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5
1.14683 - fi
1.14684 - fi
1.14685 -
1.14686 - # Now new_path has a complete unix path to the binary
1.14687 - if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then
1.14688 - # Keep paths in /bin as-is, but remove trailing .exe if any
1.14689 - new_path="${new_path/%.exe/}"
1.14690 - # Do not save /bin paths to all_fixpath_prefixes!
1.14691 - else
1.14692 - # Not in mixed or Windows style, start by that.
1.14693 - new_path=`cmd //c echo $new_path`
1.14694 -
1.14695 - input_path="$new_path"
1.14696 - # Check if we need to convert this using DOS-style short mode. If the path
1.14697 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.14698 - # take no chances and rewrite it.
1.14699 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.14700 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.14701 - if test "x$has_forbidden_chars" != x; then
1.14702 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.14703 - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.14704 - fi
1.14705 -
1.14706 - # Output is in $new_path
1.14707 -
1.14708 - windows_path="$new_path"
1.14709 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.14710 - unix_path=`$CYGPATH -u "$windows_path"`
1.14711 - new_path="$unix_path"
1.14712 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.14713 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.14714 - new_path="$unix_path"
1.14715 - fi
1.14716 -
1.14717 - # remove trailing .exe if any
1.14718 - new_path="${new_path/%.exe/}"
1.14719 -
1.14720 - # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.14721 - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.14722 - fi
1.14723 -
1.14724 - else
1.14725 - # We're on a posix platform. Hooray! :)
1.14726 - # First separate the path from the arguments. This will split at the first
1.14727 - # space.
1.14728 - complete="$OBJDUMP"
1.14729 - path="${complete%% *}"
1.14730 - tmp="$complete EOL"
1.14731 - arguments="${tmp#* }"
1.14732 -
1.14733 - # Cannot rely on the command "which" here since it doesn't always work.
1.14734 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.14735 - if test -z "$is_absolute_path"; then
1.14736 - # Path to executable is not absolute. Find it.
1.14737 - IFS_save="$IFS"
1.14738 - IFS=:
1.14739 - for p in $PATH; do
1.14740 - if test -f "$p/$path" && test -x "$p/$path"; then
1.14741 - new_path="$p/$path"
1.14742 - break
1.14743 - fi
1.14744 - done
1.14745 - IFS="$IFS_save"
1.14746 - else
1.14747 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJDUMP (as $path) failed, using $path directly." >&5
1.14748 -$as_echo "$as_me: Resolving OBJDUMP (as $path) failed, using $path directly." >&6;}
1.14749 - new_path="$path"
1.14750 - fi
1.14751 -
1.14752 - if test "x$new_path" = x; then
1.14753 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&5
1.14754 -$as_echo "$as_me: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&6;}
1.14755 - has_space=`$ECHO "$complete" | $GREP " "`
1.14756 - if test "x$has_space" != x; then
1.14757 - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
1.14758 -$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
1.14759 - fi
1.14760 - as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5
1.14761 - fi
1.14762 - fi
1.14763 -
1.14764 - # Now join together the path and the arguments once again
1.14765 - if test "x$arguments" != xEOL; then
1.14766 - new_complete="$new_path ${arguments% *}"
1.14767 - else
1.14768 - new_complete="$new_path"
1.14769 - fi
1.14770 -
1.14771 - if test "x$complete" != "x$new_complete"; then
1.14772 - OBJDUMP="$new_complete"
1.14773 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJDUMP to \"$new_complete\"" >&5
1.14774 -$as_echo "$as_me: Rewriting OBJDUMP to \"$new_complete\"" >&6;}
1.14775 - fi
1.14776 -
1.14777 - fi
1.14778 -
1.14779 -
1.14780 -
1.14781 - # Restore old path without tools dir
1.14782 - PATH="$OLD_PATH"
1.14783 -
1.14784 -
1.14785 -# FIXME: Currently we must test this after paths but before flags. Fix!
1.14786 -
1.14787 -# And we can test some aspects on the target using configure macros.
1.14788 + BUILD_LD="$new_complete"
1.14789 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_LD to \"$new_complete\"" >&5
1.14790 +$as_echo "$as_me: Rewriting BUILD_LD to \"$new_complete\"" >&6;}
1.14791 + fi
1.14792 +
1.14793 + else
1.14794 + # If we are not cross compiling, use the normal target compilers for
1.14795 + # building the build platform executables.
1.14796 + BUILD_CC="$CC"
1.14797 + BUILD_CXX="$CXX"
1.14798 + BUILD_LD="$LD"
1.14799 + fi
1.14800 +
1.14801 +
1.14802 + if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.14803 + # For hotspot, we need these in Windows mixed path,
1.14804 + # so rewrite them all. Need added .exe suffix.
1.14805 + HOTSPOT_CXX="$CXX.exe"
1.14806 + HOTSPOT_LD="$LD.exe"
1.14807 + HOTSPOT_MT="$MT.exe"
1.14808 + HOTSPOT_RC="$RC.exe"
1.14809 +
1.14810 + unix_path="$HOTSPOT_CXX"
1.14811 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.14812 + windows_path=`$CYGPATH -m "$unix_path"`
1.14813 + HOTSPOT_CXX="$windows_path"
1.14814 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.14815 + windows_path=`cmd //c echo $unix_path`
1.14816 + HOTSPOT_CXX="$windows_path"
1.14817 + fi
1.14818 +
1.14819 +
1.14820 + unix_path="$HOTSPOT_LD"
1.14821 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.14822 + windows_path=`$CYGPATH -m "$unix_path"`
1.14823 + HOTSPOT_LD="$windows_path"
1.14824 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.14825 + windows_path=`cmd //c echo $unix_path`
1.14826 + HOTSPOT_LD="$windows_path"
1.14827 + fi
1.14828 +
1.14829 +
1.14830 + unix_path="$HOTSPOT_MT"
1.14831 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.14832 + windows_path=`$CYGPATH -m "$unix_path"`
1.14833 + HOTSPOT_MT="$windows_path"
1.14834 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.14835 + windows_path=`cmd //c echo $unix_path`
1.14836 + HOTSPOT_MT="$windows_path"
1.14837 + fi
1.14838 +
1.14839 +
1.14840 + unix_path="$HOTSPOT_RC"
1.14841 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.14842 + windows_path=`$CYGPATH -m "$unix_path"`
1.14843 + HOTSPOT_RC="$windows_path"
1.14844 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.14845 + windows_path=`cmd //c echo $unix_path`
1.14846 + HOTSPOT_RC="$windows_path"
1.14847 + fi
1.14848 +
1.14849 +
1.14850 +
1.14851 + else
1.14852 + HOTSPOT_CXX="$CXX"
1.14853 + HOTSPOT_LD="$LD"
1.14854 + fi
1.14855 +
1.14856 +
1.14857 +
1.14858 + if test "x$TOOLCHAIN_TYPE" = xclang; then
1.14859 + USE_CLANG=true
1.14860 + fi
1.14861 +
1.14862 +
1.14863 + # LDEXE is the linker to use, when creating executables. Not really used.
1.14864 + # FIXME: These should just be removed!
1.14865 + LDEXE="$LD"
1.14866 + LDEXECXX="$LDCXX"
1.14867 +
1.14868 +
1.14869 +
1.14870 +
1.14871 + # The package path is used only on macosx?
1.14872 + # FIXME: clean this up, and/or move it elsewhere.
1.14873 + PACKAGE_PATH=/opt/local
1.14874 +
1.14875 +
1.14876 + # Check for extra potential brokenness.
1.14877 + if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.14878 + # On Windows, double-check that we got the right compiler.
1.14879 + CC_VERSION_OUTPUT=`$CC 2>&1 | $HEAD -n 1 | $TR -d '\r'`
1.14880 + COMPILER_CPU_TEST=`$ECHO $CC_VERSION_OUTPUT | $SED -n "s/^.* \(.*\)$/\1/p"`
1.14881 + if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
1.14882 + if test "x$COMPILER_CPU_TEST" != "x80x86"; then
1.14883 + as_fn_error $? "Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for \"$COMPILER_CPU_TEST\"; expected \"80x86\"." "$LINENO" 5
1.14884 + fi
1.14885 + elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
1.14886 + if test "x$COMPILER_CPU_TEST" != "xx64"; then
1.14887 + as_fn_error $? "Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for \"$COMPILER_CPU_TEST\"; expected \"x64\"." "$LINENO" 5
1.14888 + fi
1.14889 + fi
1.14890 + fi
1.14891 +
1.14892 + if test "x$TOOLCHAIN_TYPE" = xgcc; then
1.14893 + # If this is a --hash-style=gnu system, use --hash-style=both, why?
1.14894 + HAS_GNU_HASH=`$CC -dumpspecs 2>/dev/null | $GREP 'hash-style=gnu'`
1.14895 + # This is later checked when setting flags.
1.14896 + fi
1.14897 +
1.14898 + # Check for broken SuSE 'ld' for which 'Only anonymous version tag is allowed
1.14899 + # in executable.'
1.14900 + USING_BROKEN_SUSE_LD=no
1.14901 + if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$TOOLCHAIN_TYPE" = xgcc; then
1.14902 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken SuSE 'ld' which only understands anonymous version tags in executables" >&5
1.14903 +$as_echo_n "checking for broken SuSE 'ld' which only understands anonymous version tags in executables... " >&6; }
1.14904 + echo "SUNWprivate_1.1 { local: *; };" > version-script.map
1.14905 + echo "int main() { }" > main.c
1.14906 + if $CXX -Xlinker -version-script=version-script.map main.c 2>&5 >&5; then
1.14907 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.14908 +$as_echo "no" >&6; }
1.14909 + USING_BROKEN_SUSE_LD=no
1.14910 + else
1.14911 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.14912 +$as_echo "yes" >&6; }
1.14913 + USING_BROKEN_SUSE_LD=yes
1.14914 + fi
1.14915 + rm -rf version-script.map main.c
1.14916 + fi
1.14917 +
1.14918 +
1.14919 +
1.14920 +# Setup the JTReg Regression Test Harness.
1.14921 +
1.14922 +
1.14923 +# Check whether --with-jtreg was given.
1.14924 +if test "${with_jtreg+set}" = set; then :
1.14925 + withval=$with_jtreg;
1.14926 +else
1.14927 + with_jtreg=no
1.14928 +fi
1.14929 +
1.14930 +
1.14931 + if test "x$with_jtreg" = xno; then
1.14932 + # jtreg disabled
1.14933 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jtreg" >&5
1.14934 +$as_echo_n "checking for jtreg... " >&6; }
1.14935 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.14936 +$as_echo "no" >&6; }
1.14937 + else
1.14938 + if test "x$with_jtreg" != xyes; then
1.14939 + # with path specified.
1.14940 + JT_HOME="$with_jtreg"
1.14941 + fi
1.14942 +
1.14943 + if test "x$JT_HOME" != x; then
1.14944 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jtreg" >&5
1.14945 +$as_echo_n "checking for jtreg... " >&6; }
1.14946 +
1.14947 + # use JT_HOME enviroment var.
1.14948 +
1.14949 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.14950 +
1.14951 + # Input might be given as Windows format, start by converting to
1.14952 + # unix format.
1.14953 + path="$JT_HOME"
1.14954 + new_path=`$CYGPATH -u "$path"`
1.14955 +
1.14956 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.14957 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.14958 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.14959 + # "foo.exe" is OK but "foo" is an error.
1.14960 + #
1.14961 + # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.14962 + # It is also a way to make sure we got the proper file name for the real test later on.
1.14963 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.14964 + if test "x$test_shortpath" = x; then
1.14965 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of JT_HOME, which resolves as \"$path\", is invalid." >&5
1.14966 +$as_echo "$as_me: The path of JT_HOME, which resolves as \"$path\", is invalid." >&6;}
1.14967 + as_fn_error $? "Cannot locate the the path of JT_HOME" "$LINENO" 5
1.14968 + fi
1.14969 +
1.14970 + # Call helper function which possibly converts this using DOS-style short mode.
1.14971 + # If so, the updated path is stored in $new_path.
1.14972 +
1.14973 + input_path="$new_path"
1.14974 + # Check if we need to convert this using DOS-style short mode. If the path
1.14975 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.14976 + # take no chances and rewrite it.
1.14977 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.14978 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.14979 + if test "x$has_forbidden_chars" != x; then
1.14980 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.14981 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.14982 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.14983 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.14984 + # Going to short mode and back again did indeed matter. Since short mode is
1.14985 + # case insensitive, let's make it lowercase to improve readability.
1.14986 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.14987 + # Now convert it back to Unix-stile (cygpath)
1.14988 + input_path=`$CYGPATH -u "$shortmode_path"`
1.14989 + new_path="$input_path"
1.14990 + fi
1.14991 + fi
1.14992 +
1.14993 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.14994 + if test "x$test_cygdrive_prefix" = x; then
1.14995 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.14996 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.14997 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.14998 + # a path prefixed by /cygdrive for fixpath to work.
1.14999 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.15000 + fi
1.15001 + fi
1.15002 +
1.15003 +
1.15004 + if test "x$path" != "x$new_path"; then
1.15005 + JT_HOME="$new_path"
1.15006 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting JT_HOME to \"$new_path\"" >&5
1.15007 +$as_echo "$as_me: Rewriting JT_HOME to \"$new_path\"" >&6;}
1.15008 + fi
1.15009 +
1.15010 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.15011 +
1.15012 + path="$JT_HOME"
1.15013 + has_colon=`$ECHO $path | $GREP ^.:`
1.15014 + new_path="$path"
1.15015 + if test "x$has_colon" = x; then
1.15016 + # Not in mixed or Windows style, start by that.
1.15017 + new_path=`cmd //c echo $path`
1.15018 + fi
1.15019 +
1.15020 +
1.15021 + input_path="$new_path"
1.15022 + # Check if we need to convert this using DOS-style short mode. If the path
1.15023 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.15024 + # take no chances and rewrite it.
1.15025 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.15026 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.15027 + if test "x$has_forbidden_chars" != x; then
1.15028 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.15029 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.15030 + fi
1.15031 +
1.15032 +
1.15033 + windows_path="$new_path"
1.15034 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.15035 + unix_path=`$CYGPATH -u "$windows_path"`
1.15036 + new_path="$unix_path"
1.15037 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.15038 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.15039 + new_path="$unix_path"
1.15040 + fi
1.15041 +
1.15042 + if test "x$path" != "x$new_path"; then
1.15043 + JT_HOME="$new_path"
1.15044 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting JT_HOME to \"$new_path\"" >&5
1.15045 +$as_echo "$as_me: Rewriting JT_HOME to \"$new_path\"" >&6;}
1.15046 + fi
1.15047 +
1.15048 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.15049 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.15050 +
1.15051 + else
1.15052 + # We're on a posix platform. Hooray! :)
1.15053 + path="$JT_HOME"
1.15054 + has_space=`$ECHO "$path" | $GREP " "`
1.15055 + if test "x$has_space" != x; then
1.15056 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of JT_HOME, which resolves as \"$path\", is invalid." >&5
1.15057 +$as_echo "$as_me: The path of JT_HOME, which resolves as \"$path\", is invalid." >&6;}
1.15058 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.15059 + fi
1.15060 +
1.15061 + # Use eval to expand a potential ~
1.15062 + eval path="$path"
1.15063 + if test ! -f "$path" && test ! -d "$path"; then
1.15064 + as_fn_error $? "The path of JT_HOME, which resolves as \"$path\", is not found." "$LINENO" 5
1.15065 + fi
1.15066 +
1.15067 + JT_HOME="`cd "$path"; $THEPWDCMD -L`"
1.15068 + fi
1.15069 +
1.15070 +
1.15071 + # jtreg win32 script works for everybody
1.15072 + JTREGEXE="$JT_HOME/bin/jtreg"
1.15073 +
1.15074 + if test ! -f "$JTREGEXE"; then
1.15075 + as_fn_error $? "JTReg executable does not exist: $JTREGEXE" "$LINENO" 5
1.15076 + fi
1.15077 +
1.15078 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
1.15079 +$as_echo "$JTREGEXE" >&6; }
1.15080 + else
1.15081 + # try to find jtreg on path
1.15082 +
1.15083 +
1.15084 +
1.15085 + # Publish this variable in the help.
1.15086 +
1.15087 +
1.15088 + if test "x$JTREGEXE" = x; then
1.15089 + # The variable is not set by user, try to locate tool using the code snippet
1.15090 + for ac_prog in jtreg
1.15091 +do
1.15092 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.15093 +set dummy $ac_prog; ac_word=$2
1.15094 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.15095 +$as_echo_n "checking for $ac_word... " >&6; }
1.15096 +if ${ac_cv_path_JTREGEXE+:} false; then :
1.15097 + $as_echo_n "(cached) " >&6
1.15098 +else
1.15099 + case $JTREGEXE in
1.15100 + [\\/]* | ?:[\\/]*)
1.15101 + ac_cv_path_JTREGEXE="$JTREGEXE" # Let the user override the test with a path.
1.15102 + ;;
1.15103 + *)
1.15104 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.15105 +for as_dir in $PATH
1.15106 +do
1.15107 + IFS=$as_save_IFS
1.15108 + test -z "$as_dir" && as_dir=.
1.15109 + for ac_exec_ext in '' $ac_executable_extensions; do
1.15110 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.15111 + ac_cv_path_JTREGEXE="$as_dir/$ac_word$ac_exec_ext"
1.15112 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.15113 + break 2
1.15114 + fi
1.15115 +done
1.15116 + done
1.15117 +IFS=$as_save_IFS
1.15118 +
1.15119 + ;;
1.15120 +esac
1.15121 +fi
1.15122 +JTREGEXE=$ac_cv_path_JTREGEXE
1.15123 +if test -n "$JTREGEXE"; then
1.15124 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
1.15125 +$as_echo "$JTREGEXE" >&6; }
1.15126 +else
1.15127 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.15128 +$as_echo "no" >&6; }
1.15129 +fi
1.15130 +
1.15131 +
1.15132 + test -n "$JTREGEXE" && break
1.15133 +done
1.15134 +
1.15135 + else
1.15136 + # The variable is set, but is it from the command line or the environment?
1.15137 +
1.15138 + # Try to remove the string !JTREGEXE! from our list.
1.15139 + try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!JTREGEXE!/}
1.15140 + if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.15141 + # If it failed, the variable was not from the command line. Ignore it,
1.15142 + # but warn the user (except for BASH, which is always set by the calling BASH).
1.15143 + if test "xJTREGEXE" != xBASH; then
1.15144 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of JTREGEXE from the environment. Use command line variables instead." >&5
1.15145 +$as_echo "$as_me: WARNING: Ignoring value of JTREGEXE from the environment. Use command line variables instead." >&2;}
1.15146 + fi
1.15147 + # Try to locate tool using the code snippet
1.15148 + for ac_prog in jtreg
1.15149 +do
1.15150 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.15151 +set dummy $ac_prog; ac_word=$2
1.15152 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.15153 +$as_echo_n "checking for $ac_word... " >&6; }
1.15154 +if ${ac_cv_path_JTREGEXE+:} false; then :
1.15155 + $as_echo_n "(cached) " >&6
1.15156 +else
1.15157 + case $JTREGEXE in
1.15158 + [\\/]* | ?:[\\/]*)
1.15159 + ac_cv_path_JTREGEXE="$JTREGEXE" # Let the user override the test with a path.
1.15160 + ;;
1.15161 + *)
1.15162 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.15163 +for as_dir in $PATH
1.15164 +do
1.15165 + IFS=$as_save_IFS
1.15166 + test -z "$as_dir" && as_dir=.
1.15167 + for ac_exec_ext in '' $ac_executable_extensions; do
1.15168 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.15169 + ac_cv_path_JTREGEXE="$as_dir/$ac_word$ac_exec_ext"
1.15170 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.15171 + break 2
1.15172 + fi
1.15173 +done
1.15174 + done
1.15175 +IFS=$as_save_IFS
1.15176 +
1.15177 + ;;
1.15178 +esac
1.15179 +fi
1.15180 +JTREGEXE=$ac_cv_path_JTREGEXE
1.15181 +if test -n "$JTREGEXE"; then
1.15182 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
1.15183 +$as_echo "$JTREGEXE" >&6; }
1.15184 +else
1.15185 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.15186 +$as_echo "no" >&6; }
1.15187 +fi
1.15188 +
1.15189 +
1.15190 + test -n "$JTREGEXE" && break
1.15191 +done
1.15192 +
1.15193 + else
1.15194 + # If it succeeded, then it was overridden by the user. We will use it
1.15195 + # for the tool.
1.15196 +
1.15197 + # First remove it from the list of overridden variables, so we can test
1.15198 + # for unknown variables in the end.
1.15199 + CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.15200 +
1.15201 + # Check if the provided tool contains a complete path.
1.15202 + tool_specified="$JTREGEXE"
1.15203 + tool_basename="${tool_specified##*/}"
1.15204 + if test "x$tool_basename" = "x$tool_specified"; then
1.15205 + # A command without a complete path is provided, search $PATH.
1.15206 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool JTREGEXE=$tool_basename" >&5
1.15207 +$as_echo "$as_me: Will search for user supplied tool JTREGEXE=$tool_basename" >&6;}
1.15208 + # Extract the first word of "$tool_basename", so it can be a program name with args.
1.15209 +set dummy $tool_basename; ac_word=$2
1.15210 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.15211 +$as_echo_n "checking for $ac_word... " >&6; }
1.15212 +if ${ac_cv_path_JTREGEXE+:} false; then :
1.15213 + $as_echo_n "(cached) " >&6
1.15214 +else
1.15215 + case $JTREGEXE in
1.15216 + [\\/]* | ?:[\\/]*)
1.15217 + ac_cv_path_JTREGEXE="$JTREGEXE" # Let the user override the test with a path.
1.15218 + ;;
1.15219 + *)
1.15220 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.15221 +for as_dir in $PATH
1.15222 +do
1.15223 + IFS=$as_save_IFS
1.15224 + test -z "$as_dir" && as_dir=.
1.15225 + for ac_exec_ext in '' $ac_executable_extensions; do
1.15226 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.15227 + ac_cv_path_JTREGEXE="$as_dir/$ac_word$ac_exec_ext"
1.15228 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.15229 + break 2
1.15230 + fi
1.15231 +done
1.15232 + done
1.15233 +IFS=$as_save_IFS
1.15234 +
1.15235 + ;;
1.15236 +esac
1.15237 +fi
1.15238 +JTREGEXE=$ac_cv_path_JTREGEXE
1.15239 +if test -n "$JTREGEXE"; then
1.15240 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
1.15241 +$as_echo "$JTREGEXE" >&6; }
1.15242 +else
1.15243 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.15244 +$as_echo "no" >&6; }
1.15245 +fi
1.15246 +
1.15247 +
1.15248 + if test "x$JTREGEXE" = x; then
1.15249 + as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.15250 + fi
1.15251 + else
1.15252 + # Otherwise we believe it is a complete path. Use it as it is.
1.15253 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool JTREGEXE=$tool_specified" >&5
1.15254 +$as_echo "$as_me: Will use user supplied tool JTREGEXE=$tool_specified" >&6;}
1.15255 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JTREGEXE" >&5
1.15256 +$as_echo_n "checking for JTREGEXE... " >&6; }
1.15257 + if test ! -x "$tool_specified"; then
1.15258 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.15259 +$as_echo "not found" >&6; }
1.15260 + as_fn_error $? "User supplied tool JTREGEXE=$tool_specified does not exist or is not executable" "$LINENO" 5
1.15261 + fi
1.15262 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.15263 +$as_echo "$tool_specified" >&6; }
1.15264 + fi
1.15265 + fi
1.15266 + fi
1.15267 +
1.15268 +
1.15269 +
1.15270 + if test "x$JTREGEXE" = x; then
1.15271 + as_fn_error $? "Could not find required tool for JTREGEXE" "$LINENO" 5
1.15272 + fi
1.15273 +
1.15274 +
1.15275 + JT_HOME="`$DIRNAME $JTREGEXE`"
1.15276 + fi
1.15277 + fi
1.15278 +
1.15279 +
1.15280 +
1.15281 +
1.15282 +
1.15283 +
1.15284 + # Option used to tell the compiler whether to create 32- or 64-bit executables
1.15285 + if test "x$TOOLCHAIN_TYPE" = xxlc; then
1.15286 + COMPILER_TARGET_BITS_FLAG="-q"
1.15287 + else
1.15288 + COMPILER_TARGET_BITS_FLAG="-m"
1.15289 + fi
1.15290 +
1.15291 +
1.15292 + # FIXME: figure out if we should select AR flags depending on OS or toolchain.
1.15293 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.15294 + ARFLAGS="-r"
1.15295 + elif test "x$OPENJDK_TARGET_OS" = xaix; then
1.15296 + ARFLAGS="-X64"
1.15297 + elif test "x$OPENJDK_TARGET_OS" = xwindows; then
1.15298 + # lib.exe is used as AR to create static libraries.
1.15299 + ARFLAGS="-nologo -NODEFAULTLIB:MSVCRT"
1.15300 + else
1.15301 + ARFLAGS=""
1.15302 + fi
1.15303 +
1.15304 +
1.15305 + ## Setup strip.
1.15306 + # FIXME: should this really be per platform, or should it be per toolchain type?
1.15307 + # strip is not provided by clang or solstudio; so guessing platform makes most sense.
1.15308 + # FIXME: we should really only export STRIPFLAGS from here, not POST_STRIP_CMD.
1.15309 + if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.15310 + STRIPFLAGS="-g"
1.15311 + elif test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.15312 + STRIPFLAGS="-x"
1.15313 + elif test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.15314 + STRIPFLAGS="-S"
1.15315 + elif test "x$OPENJDK_TARGET_OS" = xaix; then
1.15316 + STRIPFLAGS="-X32_64"
1.15317 + fi
1.15318 +
1.15319 + if test "x$OPENJDK_TARGET_OS" != xwindows; then
1.15320 + POST_STRIP_CMD="$STRIP $STRIPFLAGS"
1.15321 + fi
1.15322 +
1.15323 +
1.15324 + if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.15325 + # FIXME: break out into MCSFLAGS
1.15326 + POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\""
1.15327 + fi
1.15328 +
1.15329 +
1.15330 + if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.15331 + CC_OUT_OPTION=-Fo
1.15332 + EXE_OUT_OPTION=-out:
1.15333 + LD_OUT_OPTION=-out:
1.15334 + AR_OUT_OPTION=-out:
1.15335 + else
1.15336 + # The option used to specify the target .o,.a or .so file.
1.15337 + # When compiling, how to specify the to be created object file.
1.15338 + CC_OUT_OPTION='-o$(SPACE)'
1.15339 + # When linking, how to specify the to be created executable.
1.15340 + EXE_OUT_OPTION='-o$(SPACE)'
1.15341 + # When linking, how to specify the to be created dynamically linkable library.
1.15342 + LD_OUT_OPTION='-o$(SPACE)'
1.15343 + # When archiving, how to specify the to be create static archive for object files.
1.15344 + AR_OUT_OPTION='rcs$(SPACE)'
1.15345 + fi
1.15346 +
1.15347 +
1.15348 +
1.15349 +
1.15350 +
1.15351 + # On Windows, we need to set RC flags.
1.15352 + if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.15353 + RC_FLAGS="-nologo -l 0x409 -r"
1.15354 + if test "x$VARIANT" = xOPT; then
1.15355 + RC_FLAGS="$RC_FLAGS -d NDEBUG"
1.15356 + fi
1.15357 +
1.15358 + # The version variables used to create RC_FLAGS may be overridden
1.15359 + # in a custom configure script, or possibly the command line.
1.15360 + # Let those variables be expanded at make time in spec.gmk.
1.15361 + # The \$ are escaped to the shell, and the $(...) variables
1.15362 + # are evaluated by make.
1.15363 + RC_FLAGS="$RC_FLAGS \
1.15364 + -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \
1.15365 + -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
1.15366 + -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
1.15367 + -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \
1.15368 + -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
1.15369 + -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
1.15370 + -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
1.15371 + fi
1.15372 +
1.15373 +
1.15374 + if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.15375 + # FIXME: likely bug, should be CCXXFLAGS_JDK? or one for C or CXX.
1.15376 + CCXXFLAGS="$CCXXFLAGS -nologo"
1.15377 + fi
1.15378 +
1.15379 +
1.15380 +# FIXME: Currently we must test this after toolchain but before flags. Fix!
1.15381 +
1.15382 +# Now we can test some aspects on the target using configure macros.
1.15383
1.15384
1.15385 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
1.15386 @@ -39639,134 +39928,73 @@
1.15387
1.15388 # Configure flags for the tools
1.15389
1.15390 -
1.15391 ###############################################################################
1.15392 #
1.15393 # How to compile shared libraries.
1.15394 #
1.15395
1.15396 - if test "x$GCC" = xyes; then
1.15397 - COMPILER_NAME=gcc
1.15398 + if test "x$TOOLCHAIN_TYPE" = xgcc; then
1.15399 PICFLAG="-fPIC"
1.15400 - LIBRARY_PREFIX=lib
1.15401 - SHARED_LIBRARY='lib$1.so'
1.15402 - STATIC_LIBRARY='lib$1.a'
1.15403 - SHARED_LIBRARY_FLAGS="-shared"
1.15404 - SHARED_LIBRARY_SUFFIX='.so'
1.15405 - STATIC_LIBRARY_SUFFIX='.a'
1.15406 - OBJ_SUFFIX='.o'
1.15407 - EXE_SUFFIX=''
1.15408 - SET_SHARED_LIBRARY_NAME='-Xlinker -soname=$1'
1.15409 - SET_SHARED_LIBRARY_MAPFILE='-Xlinker -version-script=$1'
1.15410 C_FLAG_REORDER=''
1.15411 CXX_FLAG_REORDER=''
1.15412 - SET_SHARED_LIBRARY_ORIGIN='-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$$$ORIGIN$1'
1.15413 - SET_EXECUTABLE_ORIGIN='-Xlinker -rpath -Xlinker \$$$$ORIGIN$1'
1.15414 - LD="$CC"
1.15415 - LDEXE="$CC"
1.15416 - LDCXX="$CXX"
1.15417 - LDEXECXX="$CXX"
1.15418 - POST_STRIP_CMD="$STRIP -g"
1.15419 -
1.15420 - # Linking is different on MacOSX
1.15421 +
1.15422 if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.15423 - # Might change in the future to clang.
1.15424 - COMPILER_NAME=gcc
1.15425 - SHARED_LIBRARY='lib$1.dylib'
1.15426 + # Linking is different on MacOSX
1.15427 SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG"
1.15428 - SHARED_LIBRARY_SUFFIX='.dylib'
1.15429 - EXE_SUFFIX=''
1.15430 + SET_EXECUTABLE_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
1.15431 + SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
1.15432 SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1'
1.15433 SET_SHARED_LIBRARY_MAPFILE=''
1.15434 - SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
1.15435 - SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
1.15436 - POST_STRIP_CMD="$STRIP -S"
1.15437 - fi
1.15438 - else
1.15439 - if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.15440 - # If it is not gcc, then assume it is the Oracle Solaris Studio Compiler
1.15441 - COMPILER_NAME=ossc
1.15442 - PICFLAG="-KPIC"
1.15443 - LIBRARY_PREFIX=lib
1.15444 - SHARED_LIBRARY='lib$1.so'
1.15445 - STATIC_LIBRARY='lib$1.a'
1.15446 - SHARED_LIBRARY_FLAGS="-G"
1.15447 - SHARED_LIBRARY_SUFFIX='.so'
1.15448 - STATIC_LIBRARY_SUFFIX='.a'
1.15449 - OBJ_SUFFIX='.o'
1.15450 - EXE_SUFFIX=''
1.15451 - SET_SHARED_LIBRARY_NAME=''
1.15452 - SET_SHARED_LIBRARY_MAPFILE='-M$1'
1.15453 - C_FLAG_REORDER='-xF'
1.15454 - CXX_FLAG_REORDER='-xF'
1.15455 - SET_SHARED_LIBRARY_ORIGIN='-R\$$$$ORIGIN$1'
1.15456 - SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
1.15457 - CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
1.15458 - CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
1.15459 - CFLAGS_JDKLIB_EXTRA='-xstrconst'
1.15460 - POST_STRIP_CMD="$STRIP -x"
1.15461 - POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\""
1.15462 - fi
1.15463 - if test "x$OPENJDK_TARGET_OS" = xaix; then
1.15464 - COMPILER_NAME=xlc
1.15465 - PICFLAG="-qpic=large"
1.15466 - LIBRARY_PREFIX=lib
1.15467 - SHARED_LIBRARY='lib$1.so'
1.15468 - STATIC_LIBRARY='lib$1.a'
1.15469 - SHARED_LIBRARY_FLAGS="-qmkshrobj"
1.15470 - SHARED_LIBRARY_SUFFIX='.so'
1.15471 - STATIC_LIBRARY_SUFFIX='.a'
1.15472 - OBJ_SUFFIX='.o'
1.15473 - EXE_SUFFIX=''
1.15474 - SET_SHARED_LIBRARY_NAME=''
1.15475 - SET_SHARED_LIBRARY_MAPFILE=''
1.15476 - C_FLAG_REORDER=''
1.15477 - CXX_FLAG_REORDER=''
1.15478 - SET_SHARED_LIBRARY_ORIGIN=''
1.15479 - SET_EXECUTABLE_ORIGIN=""
1.15480 - CFLAGS_JDK=""
1.15481 - CXXFLAGS_JDK=""
1.15482 - CFLAGS_JDKLIB_EXTRA=''
1.15483 - POST_STRIP_CMD="$STRIP -X32_64"
1.15484 - POST_MCS_CMD=""
1.15485 - fi
1.15486 - if test "x$OPENJDK_TARGET_OS" = xwindows; then
1.15487 - # If it is not gcc, then assume it is the MS Visual Studio compiler
1.15488 - COMPILER_NAME=cl
1.15489 - PICFLAG=""
1.15490 - LIBRARY_PREFIX=
1.15491 - SHARED_LIBRARY='$1.dll'
1.15492 - STATIC_LIBRARY='$1.lib'
1.15493 - SHARED_LIBRARY_FLAGS="-LD"
1.15494 - SHARED_LIBRARY_SUFFIX='.dll'
1.15495 - STATIC_LIBRARY_SUFFIX='.lib'
1.15496 - OBJ_SUFFIX='.obj'
1.15497 - EXE_SUFFIX='.exe'
1.15498 - SET_SHARED_LIBRARY_NAME=''
1.15499 - SET_SHARED_LIBRARY_MAPFILE=''
1.15500 - SET_SHARED_LIBRARY_ORIGIN=''
1.15501 - SET_EXECUTABLE_ORIGIN=''
1.15502 - fi
1.15503 - fi
1.15504 -
1.15505 -
1.15506 -
1.15507 -
1.15508 -
1.15509 -
1.15510 -
1.15511 -
1.15512 -
1.15513 -
1.15514 -
1.15515 -
1.15516 -
1.15517 -
1.15518 -
1.15519 -
1.15520 -
1.15521 -
1.15522 -
1.15523 + else
1.15524 + # Default works for linux, might work on other platforms as well.
1.15525 + SHARED_LIBRARY_FLAGS='-shared'
1.15526 + SET_EXECUTABLE_ORIGIN='-Xlinker -rpath -Xlinker \$$$$ORIGIN$1'
1.15527 + SET_SHARED_LIBRARY_ORIGIN="-Xlinker -z -Xlinker origin $SET_EXECUTABLE_ORIGIN"
1.15528 + SET_SHARED_LIBRARY_NAME='-Xlinker -soname=$1'
1.15529 + SET_SHARED_LIBRARY_MAPFILE='-Xlinker -version-script=$1'
1.15530 + fi
1.15531 + elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
1.15532 + PICFLAG="-KPIC"
1.15533 + C_FLAG_REORDER='-xF'
1.15534 + CXX_FLAG_REORDER='-xF'
1.15535 + SHARED_LIBRARY_FLAGS="-G"
1.15536 + SET_EXECUTABLE_ORIGIN='-R\$$$$ORIGIN$1'
1.15537 + SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
1.15538 + SET_SHARED_LIBRARY_NAME=''
1.15539 + SET_SHARED_LIBRARY_MAPFILE='-M$1'
1.15540 + elif test "x$TOOLCHAIN_TYPE" = xxlc; then
1.15541 + PICFLAG="-qpic=large"
1.15542 + C_FLAG_REORDER=''
1.15543 + CXX_FLAG_REORDER=''
1.15544 + SHARED_LIBRARY_FLAGS="-qmkshrobj"
1.15545 + SET_EXECUTABLE_ORIGIN=""
1.15546 + SET_SHARED_LIBRARY_ORIGIN=''
1.15547 + SET_SHARED_LIBRARY_NAME=''
1.15548 + SET_SHARED_LIBRARY_MAPFILE=''
1.15549 + elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.15550 + PICFLAG=""
1.15551 + C_FLAG_REORDER=''
1.15552 + CXX_FLAG_REORDER=''
1.15553 + SHARED_LIBRARY_FLAGS="-LD"
1.15554 + SET_EXECUTABLE_ORIGIN=''
1.15555 + SET_SHARED_LIBRARY_ORIGIN=''
1.15556 + SET_SHARED_LIBRARY_NAME=''
1.15557 + SET_SHARED_LIBRARY_MAPFILE=''
1.15558 + fi
1.15559 +
1.15560 +
1.15561 +
1.15562 +
1.15563 +
1.15564 +
1.15565 +
1.15566 +
1.15567 +
1.15568 + if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.15569 + CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
1.15570 + CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
1.15571 + CFLAGS_JDKLIB_EXTRA='-xstrconst'
1.15572 + fi
1.15573 # The (cross) compiler is now configured, we can now test capabilities
1.15574 # of the target platform.
1.15575
1.15576 @@ -39778,266 +40006,133 @@
1.15577 # and different operating systems.
1.15578 #
1.15579
1.15580 - #
1.15581 - # NOTE: check for -mstackrealign needs to be below potential addition of -m32
1.15582 - #
1.15583 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32 && test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.15584 - # On 32-bit MacOSX the OS requires C-entry points to be 16 byte aligned.
1.15585 - # While waiting for a better solution, the current workaround is to use -mstackrealign.
1.15586 - CFLAGS="$CFLAGS -mstackrealign"
1.15587 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if 32-bit compiler supports -mstackrealign" >&5
1.15588 -$as_echo_n "checking if 32-bit compiler supports -mstackrealign... " >&6; }
1.15589 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.15590 -/* end confdefs.h. */
1.15591 -int main() { return 0; }
1.15592 -_ACEOF
1.15593 -if ac_fn_cxx_try_link "$LINENO"; then :
1.15594 -
1.15595 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.15596 -$as_echo "yes" >&6; }
1.15597 -
1.15598 -else
1.15599 -
1.15600 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.15601 -$as_echo "no" >&6; }
1.15602 - as_fn_error $? "The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path." "$LINENO" 5
1.15603 -
1.15604 -
1.15605 -fi
1.15606 -rm -f core conftest.err conftest.$ac_objext \
1.15607 - conftest$ac_exeext conftest.$ac_ext
1.15608 - fi
1.15609 -
1.15610 - C_FLAG_DEPS="-MMD -MF"
1.15611 - CXX_FLAG_DEPS="-MMD -MF"
1.15612 -
1.15613 - case $COMPILER_TYPE in
1.15614 - CC )
1.15615 - case $COMPILER_NAME in
1.15616 - gcc )
1.15617 - case $OPENJDK_TARGET_OS in
1.15618 - macosx )
1.15619 - # On MacOSX we optimize for size, something
1.15620 - # we should do for all platforms?
1.15621 - C_O_FLAG_HI="-Os"
1.15622 - C_O_FLAG_NORM="-Os"
1.15623 - C_O_FLAG_NONE=""
1.15624 - ;;
1.15625 - *)
1.15626 - C_O_FLAG_HI="-O3"
1.15627 - C_O_FLAG_NORM="-O2"
1.15628 - C_O_FLAG_NONE="-O0"
1.15629 - ;;
1.15630 - esac
1.15631 - CXX_O_FLAG_HI="$C_O_FLAG_HI"
1.15632 - CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
1.15633 - CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
1.15634 - CFLAGS_DEBUG_SYMBOLS="-g"
1.15635 - CXXFLAGS_DEBUG_SYMBOLS="-g"
1.15636 - if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
1.15637 - CFLAGS_DEBUG_SYMBOLS="-g1"
1.15638 - CXXFLAGS_DEBUG_SYMBOLS="-g1"
1.15639 - fi
1.15640 - ;;
1.15641 - ossc )
1.15642 - #
1.15643 - # Forte has different names for this with their C++ compiler...
1.15644 - #
1.15645 - C_FLAG_DEPS="-xMMD -xMF"
1.15646 - CXX_FLAG_DEPS="-xMMD -xMF"
1.15647 -
1.15648 - # Extra options used with HIGHEST
1.15649 - #
1.15650 - # WARNING: Use of OPTIMIZATION_LEVEL=HIGHEST in your Makefile needs to be
1.15651 - # done with care, there are some assumptions below that need to
1.15652 - # be understood about the use of pointers, and IEEE behavior.
1.15653 - #
1.15654 - # Use non-standard floating point mode (not IEEE 754)
1.15655 - CC_HIGHEST="$CC_HIGHEST -fns"
1.15656 - # Do some simplification of floating point arithmetic (not IEEE 754)
1.15657 - CC_HIGHEST="$CC_HIGHEST -fsimple"
1.15658 - # Use single precision floating point with 'float'
1.15659 - CC_HIGHEST="$CC_HIGHEST -fsingle"
1.15660 - # Assume memory references via basic pointer types do not alias
1.15661 - # (Source with excessing pointer casting and data access with mixed
1.15662 - # pointer types are not recommended)
1.15663 - CC_HIGHEST="$CC_HIGHEST -xalias_level=basic"
1.15664 - # Use intrinsic or inline versions for math/std functions
1.15665 - # (If you expect perfect errno behavior, do not use this)
1.15666 - CC_HIGHEST="$CC_HIGHEST -xbuiltin=%all"
1.15667 - # Loop data dependency optimizations (need -xO3 or higher)
1.15668 - CC_HIGHEST="$CC_HIGHEST -xdepend"
1.15669 - # Pointer parameters to functions do not overlap
1.15670 - # (Similar to -xalias_level=basic usage, but less obvious sometimes.
1.15671 - # If you pass in multiple pointers to the same data, do not use this)
1.15672 - CC_HIGHEST="$CC_HIGHEST -xrestrict"
1.15673 - # Inline some library routines
1.15674 - # (If you expect perfect errno behavior, do not use this)
1.15675 - CC_HIGHEST="$CC_HIGHEST -xlibmil"
1.15676 - # Use optimized math routines
1.15677 - # (If you expect perfect errno behavior, do not use this)
1.15678 - # Can cause undefined external on Solaris 8 X86 on __sincos, removing for now
1.15679 - #CC_HIGHEST="$CC_HIGHEST -xlibmopt"
1.15680 -
1.15681 - if test "x$OPENJDK_TARGET_CPU" = xsparc; then
1.15682 - CFLAGS_JDK="${CFLAGS_JDK} -xmemalign=4s"
1.15683 - CXXFLAGS_JDK="${CXXFLAGS_JDK} -xmemalign=4s"
1.15684 - fi
1.15685 -
1.15686 - case $OPENJDK_TARGET_CPU_ARCH in
1.15687 - x86)
1.15688 - C_O_FLAG_HIGHEST="-xO4 -Wu,-O4~yz $CC_HIGHEST -xregs=no%frameptr"
1.15689 - C_O_FLAG_HI="-xO4 -Wu,-O4~yz -xregs=no%frameptr"
1.15690 - C_O_FLAG_NORM="-xO2 -Wu,-O2~yz -xregs=no%frameptr"
1.15691 - C_O_FLAG_NONE="-xregs=no%frameptr"
1.15692 - CXX_O_FLAG_HIGHEST="-xO4 -Qoption ube -O4~yz $CC_HIGHEST -xregs=no%frameptr"
1.15693 - CXX_O_FLAG_HI="-xO4 -Qoption ube -O4~yz -xregs=no%frameptr"
1.15694 - CXX_O_FLAG_NORM="-xO2 -Qoption ube -O2~yz -xregs=no%frameptr"
1.15695 - CXX_O_FLAG_NONE="-xregs=no%frameptr"
1.15696 - if test "x$OPENJDK_TARGET_CPU" = xx86; then
1.15697 - C_O_FLAG_HIGHEST="$C_O_FLAG_HIGHEST -xchip=pentium"
1.15698 - CXX_O_FLAG_HIGHEST="$CXX_O_FLAG_HIGHEST -xchip=pentium"
1.15699 - fi
1.15700 - ;;
1.15701 - sparc)
1.15702 - CFLAGS_JDKLIB_EXTRA="${CFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
1.15703 - CXXFLAGS_JDKLIB_EXTRA="${CXXFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
1.15704 - C_O_FLAG_HIGHEST="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
1.15705 - C_O_FLAG_HI="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0"
1.15706 - C_O_FLAG_NORM="-xO2 -Wc,-Qrm-s -Wc,-Qiselect-T0"
1.15707 - C_O_FLAG_NONE=""
1.15708 - CXX_O_FLAG_HIGHEST="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
1.15709 - CXX_O_FLAG_HI="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0"
1.15710 - CXX_O_FLAG_NORM="-xO2 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0"
1.15711 - CXX_O_FLAG_NONE=""
1.15712 - ;;
1.15713 - esac
1.15714 -
1.15715 - CFLAGS_DEBUG_SYMBOLS="-g -xs"
1.15716 - CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs"
1.15717 - ;;
1.15718 - xlc )
1.15719 - C_FLAG_DEPS="-qmakedep=gcc -MF"
1.15720 - CXX_FLAG_DEPS="-qmakedep=gcc -MF"
1.15721 - C_O_FLAG_HIGHEST="-O3"
1.15722 - C_O_FLAG_HI="-O3 -qstrict"
1.15723 - C_O_FLAG_NORM="-O2"
1.15724 - C_O_FLAG_NONE=""
1.15725 - CXX_O_FLAG_HIGHEST="-O3"
1.15726 - CXX_O_FLAG_HI="-O3 -qstrict"
1.15727 - CXX_O_FLAG_NORM="-O2"
1.15728 - CXX_O_FLAG_NONE=""
1.15729 - CFLAGS_DEBUG_SYMBOLS="-g"
1.15730 - CXXFLAGS_DEBUG_SYMBOLS="-g"
1.15731 - LDFLAGS_JDK="${LDFLAGS_JDK} -q64 -brtl -bnolibpath -liconv -bexpall"
1.15732 - CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
1.15733 - CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
1.15734 - ;;
1.15735 - esac
1.15736 - ;;
1.15737 - CL )
1.15738 + # FIXME: this was indirectly the old default, but just inherited.
1.15739 + # if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.15740 + # C_FLAG_DEPS="-MMD -MF"
1.15741 + # fi
1.15742 +
1.15743 + # Generate make dependency files
1.15744 + if test "x$TOOLCHAIN_TYPE" = xgcc; then
1.15745 + C_FLAG_DEPS="-MMD -MF"
1.15746 + elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
1.15747 + C_FLAG_DEPS="-xMMD -xMF"
1.15748 + elif test "x$TOOLCHAIN_TYPE" = xxlc; then
1.15749 + C_FLAG_DEPS="-qmakedep=gcc -MF"
1.15750 + fi
1.15751 + CXX_FLAG_DEPS="$C_FLAG_DEPS"
1.15752 +
1.15753 +
1.15754 +
1.15755 + # Debug symbols
1.15756 + if test "x$TOOLCHAIN_TYPE" = xgcc; then
1.15757 + if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
1.15758 + CFLAGS_DEBUG_SYMBOLS="-g1"
1.15759 + CXXFLAGS_DEBUG_SYMBOLS="-g1"
1.15760 + else
1.15761 + CFLAGS_DEBUG_SYMBOLS="-g"
1.15762 + CXXFLAGS_DEBUG_SYMBOLS="-g"
1.15763 + fi
1.15764 + elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
1.15765 + CFLAGS_DEBUG_SYMBOLS="-g -xs"
1.15766 + CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs"
1.15767 + elif test "x$TOOLCHAIN_TYPE" = xxlc; then
1.15768 + CFLAGS_DEBUG_SYMBOLS="-g"
1.15769 + CXXFLAGS_DEBUG_SYMBOLS="-g"
1.15770 + fi
1.15771 +
1.15772 +
1.15773 +
1.15774 + # Optimization levels
1.15775 + if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
1.15776 + CC_HIGHEST="$CC_HIGHEST -fns -fsimple -fsingle -xalias_level=basic -xbuiltin=%all -xdepend -xrestrict -xlibmil"
1.15777 +
1.15778 + if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86"; then
1.15779 + # FIXME: seems we always set -xregs=no%frameptr; put it elsewhere more global?
1.15780 + C_O_FLAG_HIGHEST="-xO4 -Wu,-O4~yz $CC_HIGHEST -xregs=no%frameptr"
1.15781 + C_O_FLAG_HI="-xO4 -Wu,-O4~yz -xregs=no%frameptr"
1.15782 + C_O_FLAG_NORM="-xO2 -Wu,-O2~yz -xregs=no%frameptr"
1.15783 + C_O_FLAG_NONE="-xregs=no%frameptr"
1.15784 + CXX_O_FLAG_HIGHEST="-xO4 -Qoption ube -O4~yz $CC_HIGHEST -xregs=no%frameptr"
1.15785 + CXX_O_FLAG_HI="-xO4 -Qoption ube -O4~yz -xregs=no%frameptr"
1.15786 + CXX_O_FLAG_NORM="-xO2 -Qoption ube -O2~yz -xregs=no%frameptr"
1.15787 + CXX_O_FLAG_NONE="-xregs=no%frameptr"
1.15788 + if test "x$OPENJDK_TARGET_CPU_BITS" = "x32"; then
1.15789 + C_O_FLAG_HIGHEST="$C_O_FLAG_HIGHEST -xchip=pentium"
1.15790 + CXX_O_FLAG_HIGHEST="$CXX_O_FLAG_HIGHEST -xchip=pentium"
1.15791 + fi
1.15792 + elif test "x$OPENJDK_TARGET_CPU_ARCH" = "xsparc"; then
1.15793 + C_O_FLAG_HIGHEST="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
1.15794 + C_O_FLAG_HI="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0"
1.15795 + C_O_FLAG_NORM="-xO2 -Wc,-Qrm-s -Wc,-Qiselect-T0"
1.15796 + C_O_FLAG_NONE=""
1.15797 + CXX_O_FLAG_HIGHEST="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
1.15798 + CXX_O_FLAG_HI="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0"
1.15799 + CXX_O_FLAG_NORM="-xO2 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0"
1.15800 + CXX_O_FLAG_NONE=""
1.15801 + fi
1.15802 + else
1.15803 + # The remaining toolchains share opt flags between CC and CXX;
1.15804 + # setup for C and duplicate afterwards.
1.15805 + if test "x$TOOLCHAIN_TYPE" = xgcc; then
1.15806 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.15807 + # On MacOSX we optimize for size, something
1.15808 + # we should do for all platforms?
1.15809 + C_O_FLAG_HIGHEST="-Os"
1.15810 + C_O_FLAG_HI="-Os"
1.15811 + C_O_FLAG_NORM="-Os"
1.15812 + C_O_FLAG_NONE=""
1.15813 + else
1.15814 + C_O_FLAG_HIGHEST="-O3"
1.15815 + C_O_FLAG_HI="-O3"
1.15816 + C_O_FLAG_NORM="-O2"
1.15817 + C_O_FLAG_NONE="-O0"
1.15818 + fi
1.15819 + elif test "x$TOOLCHAIN_TYPE" = xxlc; then
1.15820 + C_O_FLAG_HIGHEST="-O3"
1.15821 + C_O_FLAG_HI="-O3 -qstrict"
1.15822 + C_O_FLAG_NORM="-O2"
1.15823 + C_O_FLAG_NONE=""
1.15824 + elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.15825 C_O_FLAG_HIGHEST="-O2"
1.15826 C_O_FLAG_HI="-O1"
1.15827 C_O_FLAG_NORM="-O1"
1.15828 C_O_FLAG_NONE="-Od"
1.15829 - CXX_O_FLAG_HIGHEST="$C_O_FLAG_HIGHEST"
1.15830 - CXX_O_FLAG_HI="$C_O_FLAG_HI"
1.15831 - CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
1.15832 - CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
1.15833 - ;;
1.15834 - esac
1.15835 -
1.15836 - if test -z "$C_O_FLAG_HIGHEST"; then
1.15837 - C_O_FLAG_HIGHEST="$C_O_FLAG_HI"
1.15838 - fi
1.15839 -
1.15840 - if test -z "$CXX_O_FLAG_HIGHEST"; then
1.15841 - CXX_O_FLAG_HIGHEST="$CXX_O_FLAG_HI"
1.15842 - fi
1.15843 -
1.15844 -
1.15845 -
1.15846 -
1.15847 -
1.15848 -
1.15849 -
1.15850 -
1.15851 -
1.15852 -
1.15853 -
1.15854 -
1.15855 -
1.15856 -
1.15857 - if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then
1.15858 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags" >&5
1.15859 -$as_echo "$as_me: WARNING: Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags" >&2;}
1.15860 - fi
1.15861 -
1.15862 - if test "x$CXXFLAGS" != "x${ADDED_CXXFLAGS}"; then
1.15863 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring CXXFLAGS($CXXFLAGS) found in environment. Use --with-extra-cxxflags" >&5
1.15864 -$as_echo "$as_me: WARNING: Ignoring CXXFLAGS($CXXFLAGS) found in environment. Use --with-extra-cxxflags" >&2;}
1.15865 - fi
1.15866 -
1.15867 - if test "x$LDFLAGS" != "x${ADDED_LDFLAGS}"; then
1.15868 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags" >&5
1.15869 -$as_echo "$as_me: WARNING: Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags" >&2;}
1.15870 - fi
1.15871 -
1.15872 -
1.15873 -# Check whether --with-extra-cflags was given.
1.15874 -if test "${with_extra_cflags+set}" = set; then :
1.15875 - withval=$with_extra_cflags;
1.15876 -fi
1.15877 -
1.15878 -
1.15879 -
1.15880 -# Check whether --with-extra-cxxflags was given.
1.15881 -if test "${with_extra_cxxflags+set}" = set; then :
1.15882 - withval=$with_extra_cxxflags;
1.15883 -fi
1.15884 -
1.15885 -
1.15886 -
1.15887 -# Check whether --with-extra-ldflags was given.
1.15888 -if test "${with_extra_ldflags+set}" = set; then :
1.15889 - withval=$with_extra_ldflags;
1.15890 -fi
1.15891 -
1.15892 -
1.15893 - CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags"
1.15894 - CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags"
1.15895 - LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
1.15896 -
1.15897 - # Hotspot needs these set in their legacy form
1.15898 - LEGACY_EXTRA_CFLAGS=$with_extra_cflags
1.15899 - LEGACY_EXTRA_CXXFLAGS=$with_extra_cxxflags
1.15900 - LEGACY_EXTRA_LDFLAGS=$with_extra_ldflags
1.15901 -
1.15902 -
1.15903 -
1.15904 -
1.15905 -
1.15906 - ###############################################################################
1.15907 - #
1.15908 - # Now setup the CFLAGS and LDFLAGS for the JDK build.
1.15909 - # Later we will also have CFLAGS and LDFLAGS for the hotspot subrepo build.
1.15910 - # CFLAGS_JDK - C Compiler flags
1.15911 - # CXXFLAGS_JDK - C++ Compiler flags
1.15912 - # COMMON_CCXXFLAGS_JDK - common to C and C++
1.15913 - #
1.15914 - case $COMPILER_NAME in
1.15915 - gcc )
1.15916 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
1.15917 - -pipe \
1.15918 - -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
1.15919 - CXXSTD_CXXFLAG="-std=gnu++98"
1.15920 -
1.15921 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$CXXSTD_CXXFLAG $CFLAGS_WARNINGS_ARE_ERRORS\"" >&5
1.15922 -$as_echo_n "checking if the C++ compiler supports \"$CXXSTD_CXXFLAG $CFLAGS_WARNINGS_ARE_ERRORS\"... " >&6; }
1.15923 + fi
1.15924 + CXX_O_FLAG_HIGHEST="$C_O_FLAG_HIGHEST"
1.15925 + CXX_O_FLAG_HI="$C_O_FLAG_HI"
1.15926 + CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
1.15927 + CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
1.15928 + fi
1.15929 +
1.15930 +
1.15931 +
1.15932 +
1.15933 +
1.15934 +
1.15935 +
1.15936 +
1.15937 +
1.15938 +
1.15939 +
1.15940 + # Special extras...
1.15941 + if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
1.15942 + if test "x$OPENJDK_TARGET_CPU_ARCH" = "xsparc"; then
1.15943 + CFLAGS_JDKLIB_EXTRA="${CFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
1.15944 + CXXFLAGS_JDKLIB_EXTRA="${CXXFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
1.15945 + fi
1.15946 + elif test "x$TOOLCHAIN_TYPE" = xxlc; then
1.15947 + LDFLAGS_JDK="${LDFLAGS_JDK} -q64 -brtl -bnolibpath -liconv -bexpall"
1.15948 + CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
1.15949 + CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
1.15950 + elif test "x$TOOLCHAIN_TYPE" = xgcc; then
1.15951 + CXXSTD_CXXFLAG="-std=gnu++98"
1.15952 +
1.15953 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$CXXSTD_CXXFLAG -Werror\"" >&5
1.15954 +$as_echo_n "checking if the C++ compiler supports \"$CXXSTD_CXXFLAG -Werror\"... " >&6; }
1.15955 supports=yes
1.15956
1.15957 saved_cxxflags="$CXXFLAGS"
1.15958 - CXXFLAGS="$CXXFLAG $CXXSTD_CXXFLAG $CFLAGS_WARNINGS_ARE_ERRORS"
1.15959 + CXXFLAGS="$CXXFLAG $CXXSTD_CXXFLAG -Werror"
1.15960 ac_ext=cpp
1.15961 ac_cpp='$CXXCPP $CPPFLAGS'
1.15962 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1.15963 @@ -40070,21 +40165,85 @@
1.15964 CXXSTD_CXXFLAG=""
1.15965 fi
1.15966
1.15967 - CXXFLAGS_JDK="${CXXFLAGS_JDK} ${CXXSTD_CXXFLAG}"
1.15968 -
1.15969 - case $OPENJDK_TARGET_CPU_ARCH in
1.15970 - arm )
1.15971 - # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing
1.15972 - CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
1.15973 - ;;
1.15974 - ppc )
1.15975 - # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing
1.15976 - ;;
1.15977 - * )
1.15978 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -fno-omit-frame-pointer"
1.15979 - CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
1.15980 - ;;
1.15981 - esac
1.15982 + CXXFLAGS_JDK="${CXXFLAGS_JDK} ${CXXSTD_CXXFLAG}"
1.15983 + JVM_CFLAGS="${JVM_CFLAGS} ${CXXSTD_CXXFLAG}"
1.15984 +
1.15985 + fi
1.15986 +
1.15987 + if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then
1.15988 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags" >&5
1.15989 +$as_echo "$as_me: WARNING: Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags" >&2;}
1.15990 + fi
1.15991 +
1.15992 + if test "x$CXXFLAGS" != "x${ADDED_CXXFLAGS}"; then
1.15993 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring CXXFLAGS($CXXFLAGS) found in environment. Use --with-extra-cxxflags" >&5
1.15994 +$as_echo "$as_me: WARNING: Ignoring CXXFLAGS($CXXFLAGS) found in environment. Use --with-extra-cxxflags" >&2;}
1.15995 + fi
1.15996 +
1.15997 + if test "x$LDFLAGS" != "x${ADDED_LDFLAGS}"; then
1.15998 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags" >&5
1.15999 +$as_echo "$as_me: WARNING: Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags" >&2;}
1.16000 + fi
1.16001 +
1.16002 +
1.16003 +# Check whether --with-extra-cflags was given.
1.16004 +if test "${with_extra_cflags+set}" = set; then :
1.16005 + withval=$with_extra_cflags;
1.16006 +fi
1.16007 +
1.16008 +
1.16009 +
1.16010 +# Check whether --with-extra-cxxflags was given.
1.16011 +if test "${with_extra_cxxflags+set}" = set; then :
1.16012 + withval=$with_extra_cxxflags;
1.16013 +fi
1.16014 +
1.16015 +
1.16016 +
1.16017 +# Check whether --with-extra-ldflags was given.
1.16018 +if test "${with_extra_ldflags+set}" = set; then :
1.16019 + withval=$with_extra_ldflags;
1.16020 +fi
1.16021 +
1.16022 +
1.16023 + CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags"
1.16024 + CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags"
1.16025 + LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
1.16026 +
1.16027 + # Hotspot needs these set in their legacy form
1.16028 + LEGACY_EXTRA_CFLAGS=$with_extra_cflags
1.16029 + LEGACY_EXTRA_CXXFLAGS=$with_extra_cxxflags
1.16030 + LEGACY_EXTRA_LDFLAGS=$with_extra_ldflags
1.16031 +
1.16032 +
1.16033 +
1.16034 +
1.16035 +
1.16036 + ###############################################################################
1.16037 + #
1.16038 + # Now setup the CFLAGS and LDFLAGS for the JDK build.
1.16039 + # Later we will also have CFLAGS and LDFLAGS for the hotspot subrepo build.
1.16040 + #
1.16041 +
1.16042 + # Setup compiler/platform specific flags to CFLAGS_JDK,
1.16043 + # CXXFLAGS_JDK and CCXXFLAGS_JDK (common to C and CXX?)
1.16044 + if test "x$TOOLCHAIN_TYPE" = xgcc; then
1.16045 + # these options are used for both C and C++ compiles
1.16046 + CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Wall -Wno-parentheses -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \
1.16047 + -pipe -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
1.16048 + case $OPENJDK_TARGET_CPU_ARCH in
1.16049 + arm )
1.16050 + # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing
1.16051 + CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
1.16052 + ;;
1.16053 + ppc )
1.16054 + # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing
1.16055 + ;;
1.16056 + * )
1.16057 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer"
1.16058 + CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
1.16059 + ;;
1.16060 + esac
1.16061
1.16062 REFERENCE_VERSION=6
1.16063
1.16064 @@ -40303,44 +40462,29 @@
1.16065 :
1.16066 fi
1.16067
1.16068 - ;;
1.16069 - ossc )
1.16070 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -DTRACING -DMACRO_MEMSYS_OPS -DBREAKPTS"
1.16071 - case $OPENJDK_TARGET_CPU_ARCH in
1.16072 - x86 )
1.16073 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DcpuIntel -Di586 -D$OPENJDK_TARGET_CPU_LEGACY_LIB"
1.16074 - CFLAGS_JDK="$CFLAGS_JDK -erroff=E_BAD_PRAGMA_PACK_VALUE"
1.16075 - ;;
1.16076 - esac
1.16077 -
1.16078 - CFLAGS_JDK="$CFLAGS_JDK -xc99=%none -xCC -errshort=tags -Xa -v -mt -W0,-noglobal"
1.16079 - CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt -features=no%except -DCC_NOEX -norunpath -xnolib"
1.16080 -
1.16081 - LDFLAGS_JDK="$LDFLAGS_JDK -z defs -xildoff -ztext"
1.16082 - LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK -norunpath -xnolib"
1.16083 - ;;
1.16084 - xlc )
1.16085 - CFLAGS_JDK="$CFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
1.16086 - CXXFLAGS_JDK="$CXXFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
1.16087 -
1.16088 - LDFLAGS_JDK="$LDFLAGS_JDK"
1.16089 - LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK"
1.16090 - ;;
1.16091 - cl )
1.16092 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -Zi -MD -Zc:wchar_t- -W3 -wd4800 \
1.16093 - -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB -DWIN32_LEAN_AND_MEAN \
1.16094 - -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \
1.16095 - -DWIN32 -DIAL"
1.16096 - case $OPENJDK_TARGET_CPU in
1.16097 - x86 )
1.16098 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_X86_ -Dx86"
1.16099 - ;;
1.16100 - x86_64 )
1.16101 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_AMD64_ -Damd64"
1.16102 - ;;
1.16103 - esac
1.16104 - ;;
1.16105 - esac
1.16106 + elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
1.16107 + CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -DTRACING -DMACRO_MEMSYS_OPS -DBREAKPTS"
1.16108 + if test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then
1.16109 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DcpuIntel -Di586 -D$OPENJDK_TARGET_CPU_LEGACY_LIB"
1.16110 + CFLAGS_JDK="$CFLAGS_JDK -erroff=E_BAD_PRAGMA_PACK_VALUE"
1.16111 + fi
1.16112 +
1.16113 + CFLAGS_JDK="$CFLAGS_JDK -xc99=%none -xCC -errshort=tags -Xa -v -mt -W0,-noglobal"
1.16114 + CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt -features=no%except -DCC_NOEX -norunpath -xnolib"
1.16115 + elif test "x$TOOLCHAIN_TYPE" = xxlc; then
1.16116 + CFLAGS_JDK="$CFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
1.16117 + CXXFLAGS_JDK="$CXXFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
1.16118 + elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.16119 + CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Zi -MD -Zc:wchar_t- -W3 -wd4800 \
1.16120 + -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB -DWIN32_LEAN_AND_MEAN \
1.16121 + -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \
1.16122 + -DWIN32 -DIAL"
1.16123 + if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
1.16124 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_AMD64_ -Damd64"
1.16125 + else
1.16126 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_X86_ -Dx86"
1.16127 + fi
1.16128 + fi
1.16129
1.16130 ###############################################################################
1.16131
1.16132 @@ -40366,12 +40510,13 @@
1.16133 ;;
1.16134 esac
1.16135
1.16136 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK $ADD_LP64"
1.16137 -
1.16138 - # The package path is used only on macosx?
1.16139 - PACKAGE_PATH=/opt/local
1.16140 -
1.16141 -
1.16142 + # Setup LP64
1.16143 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK $ADD_LP64"
1.16144 +
1.16145 + # Set some common defines. These works for all compilers, but assume
1.16146 + # -D is universally accepted.
1.16147 +
1.16148 + # Setup endianness
1.16149 if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
1.16150 # The macro _LITTLE_ENDIAN needs to be defined the same to avoid the
1.16151 # Sun C compiler warning message: warning: macro redefined: _LITTLE_ENDIAN
1.16152 @@ -40379,55 +40524,68 @@
1.16153 # Note: -Dmacro is the same as #define macro 1
1.16154 # -Dmacro= is the same as #define macro
1.16155 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.16156 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN="
1.16157 - else
1.16158 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN"
1.16159 - fi
1.16160 - else
1.16161 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN"
1.16162 - fi
1.16163 - if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.16164 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX"
1.16165 - fi
1.16166 - if test "x$OPENJDK_TARGET_OS" = xwindows; then
1.16167 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DWINDOWS"
1.16168 - fi
1.16169 - if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.16170 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DSOLARIS"
1.16171 - fi
1.16172 - if test "x$OPENJDK_TARGET_OS" = xaix; then
1.16173 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DAIX -DPPC64"
1.16174 - fi
1.16175 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN="
1.16176 + else
1.16177 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN"
1.16178 + fi
1.16179 + else
1.16180 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN"
1.16181 + fi
1.16182 +
1.16183 + # Setup target OS define. Use OS target name but in upper case.
1.16184 + OPENJDK_TARGET_OS_UPPERCASE=`$ECHO $OPENJDK_TARGET_OS | $TR 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
1.16185 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D$OPENJDK_TARGET_OS_UPPERCASE"
1.16186 +
1.16187 + # Setup target CPU
1.16188 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DARCH='\"$OPENJDK_TARGET_CPU_LEGACY\"' -D$OPENJDK_TARGET_CPU_LEGACY"
1.16189 +
1.16190 + # Setup debug/release defines
1.16191 + if test "x$DEBUG_LEVEL" = xrelease; then
1.16192 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DNDEBUG"
1.16193 + if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.16194 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DTRIMMED"
1.16195 + fi
1.16196 + else
1.16197 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DDEBUG"
1.16198 + fi
1.16199 +
1.16200 + # Setup release name
1.16201 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"\$(RELEASE)\"'"
1.16202 +
1.16203 +
1.16204 + # Set some additional per-OS defines.
1.16205 if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.16206 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
1.16207 - # Setting these parameters makes it an error to link to macosx APIs that are
1.16208 - # newer than the given OS version and makes the linked binaries compatible even
1.16209 - # if built on a newer version of the OS.
1.16210 - # The expected format is X.Y.Z
1.16211 - MACOSX_VERSION_MIN=10.7.0
1.16212 -
1.16213 - # The macro takes the version with no dots, ex: 1070
1.16214 - # Let the flags variables get resolved in make for easier override on make
1.16215 - # command line.
1.16216 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
1.16217 - LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
1.16218 - fi
1.16219 - if test "x$OPENJDK_TARGET_OS" = xbsd; then
1.16220 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"
1.16221 - fi
1.16222 - if test "x$DEBUG_LEVEL" = xrelease; then
1.16223 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DNDEBUG"
1.16224 - if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.16225 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DTRIMMED"
1.16226 - fi
1.16227 - else
1.16228 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DDEBUG"
1.16229 - fi
1.16230 -
1.16231 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DARCH='\"$OPENJDK_TARGET_CPU_LEGACY\"' -D$OPENJDK_TARGET_CPU_LEGACY"
1.16232 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DRELEASE='\"\$(RELEASE)\"'"
1.16233 -
1.16234 - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
1.16235 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
1.16236 + elif test "x$OPENJDK_TARGET_OS" = xaix; then
1.16237 + # FIXME: PPC64 should not be here.
1.16238 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DPPC64"
1.16239 + elif test "x$OPENJDK_TARGET_OS" = xbsd; then
1.16240 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_ALLBSD_SOURCE"
1.16241 + fi
1.16242 +
1.16243 + # Additional macosx handling
1.16244 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.16245 + if test "x$TOOLCHAIN_TYPE" = xgcc; then
1.16246 + # FIXME: This needs to be exported in spec.gmk due to closed legacy code.
1.16247 + # FIXME: clean this up, and/or move it elsewhere.
1.16248 +
1.16249 + # Setting these parameters makes it an error to link to macosx APIs that are
1.16250 + # newer than the given OS version and makes the linked binaries compatible
1.16251 + # even if built on a newer version of the OS.
1.16252 + # The expected format is X.Y.Z
1.16253 + MACOSX_VERSION_MIN=10.7.0
1.16254 +
1.16255 +
1.16256 + # The macro takes the version with no dots, ex: 1070
1.16257 + # Let the flags variables get resolved in make for easier override on make
1.16258 + # command line.
1.16259 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
1.16260 + LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
1.16261 + fi
1.16262 + fi
1.16263 +
1.16264 + # Setup some hard coded includes
1.16265 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK \
1.16266 -I${JDK_OUTPUTDIR}/include \
1.16267 -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \
1.16268 -I${JDK_TOPDIR}/src/share/javavm/export \
1.16269 @@ -40436,13 +40594,20 @@
1.16270 -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common"
1.16271
1.16272 # The shared libraries are compiled using the picflag.
1.16273 - CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA"
1.16274 - CXXFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA "
1.16275 + CFLAGS_JDKLIB="$CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA"
1.16276 + CXXFLAGS_JDKLIB="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA "
1.16277
1.16278 # Executable flags
1.16279 - CFLAGS_JDKEXE="$COMMON_CCXXFLAGS_JDK $CFLAGS_JDK"
1.16280 - CXXFLAGS_JDKEXE="$COMMON_CCXXFLAGS_JDK $CXXFLAGS_JDK"
1.16281 -
1.16282 + CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK"
1.16283 + CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK"
1.16284 +
1.16285 +
1.16286 +
1.16287 +
1.16288 +
1.16289 +
1.16290 + # Setup LDFLAGS et al.
1.16291 + #
1.16292 # Now this is odd. The JDK native libraries have to link against libjvm.so
1.16293 # On 32-bit machines there is normally two distinct libjvm.so:s, client and server.
1.16294 # Which should we link to? Are we lucky enough that the binary api to the libjvm.so library
1.16295 @@ -40451,9 +40616,9 @@
1.16296 # libraries will link to whatever is in memory. Yuck.
1.16297 #
1.16298 # Thus we offer the compiler to find libjvm.so first in server then in client. It works. Ugh.
1.16299 - if test "x$COMPILER_NAME" = xcl; then
1.16300 + if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.16301 LDFLAGS_JDK="$LDFLAGS_JDK -nologo -opt:ref -incremental:no"
1.16302 - if test "x$OPENJDK_TARGET_CPU" = xx86; then
1.16303 + if test "x$OPENJDK_TARGET_CPU_BITS" = "x32"; then
1.16304 LDFLAGS_JDK="$LDFLAGS_JDK -safeseh"
1.16305 fi
1.16306 # TODO: make -debug optional "--disable-full-debug-symbols"
1.16307 @@ -40467,17 +40632,16 @@
1.16308 fi
1.16309 LDFLAGS_JDKEXE="${LDFLAGS_JDK} /STACK:$LDFLAGS_STACK_SIZE"
1.16310 else
1.16311 - if test "x$COMPILER_NAME" = xgcc; then
1.16312 + if test "x$TOOLCHAIN_TYPE" = xgcc; then
1.16313 # If this is a --hash-style=gnu system, use --hash-style=both, why?
1.16314 - HAS_GNU_HASH=`$CC -dumpspecs 2>/dev/null | $GREP 'hash-style=gnu'`
1.16315 + # We have previously set HAS_GNU_HASH if this is the case
1.16316 if test -n "$HAS_GNU_HASH"; then
1.16317 LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker --hash-style=both "
1.16318 fi
1.16319 if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.16320 - # And since we now know that the linker is gnu, then add:
1.16321 - # -z defs, to forbid undefined symbols in object files
1.16322 - # -z noexecstack, to mark stack regions as non-executable
1.16323 - LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs -Xlinker -z -Xlinker noexecstack"
1.16324 + # And since we now know that the linker is gnu, then add -z defs, to forbid
1.16325 + # undefined symbols in object files.
1.16326 + LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs"
1.16327 if test "x$DEBUG_LEVEL" = "xrelease"; then
1.16328 # When building release libraries, tell the linker optimize them.
1.16329 # Should this be supplied to the OSS linker as well?
1.16330 @@ -40485,6 +40649,12 @@
1.16331 fi
1.16332 fi
1.16333 fi
1.16334 +
1.16335 + if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
1.16336 + LDFLAGS_JDK="$LDFLAGS_JDK -z defs -xildoff -ztext"
1.16337 + LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK -norunpath -xnolib"
1.16338 + fi
1.16339 +
1.16340 LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \
1.16341 -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}"
1.16342
1.16343 @@ -40503,7 +40673,7 @@
1.16344 fi
1.16345
1.16346 LDFLAGS_JDKLIB_SUFFIX="-ljava -ljvm"
1.16347 - if test "x$COMPILER_NAME" = xossc; then
1.16348 + if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
1.16349 LDFLAGS_JDKLIB_SUFFIX="$LDFLAGS_JDKLIB_SUFFIX -lc"
1.16350 fi
1.16351
1.16352 @@ -40519,13 +40689,6 @@
1.16353
1.16354
1.16355
1.16356 -
1.16357 -
1.16358 -
1.16359 -
1.16360 -
1.16361 -
1.16362 -
1.16363 # Some Zero and Shark settings.
1.16364 # ZERO_ARCHFLAG tells the compiler which mode to build for
1.16365 case "${OPENJDK_TARGET_CPU}" in
1.16366 @@ -40728,27 +40891,6 @@
1.16367
1.16368
1.16369
1.16370 - # Check for broken SuSE 'ld' for which 'Only anonymous version tag is allowed in executable.'
1.16371 - USING_BROKEN_SUSE_LD=no
1.16372 - if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$GCC" = xyes; then
1.16373 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken SuSE 'ld' which only understands anonymous version tags in executables" >&5
1.16374 -$as_echo_n "checking for broken SuSE 'ld' which only understands anonymous version tags in executables... " >&6; }
1.16375 - echo "SUNWprivate_1.1 { local: *; };" > version-script.map
1.16376 - echo "int main() { }" > main.c
1.16377 - if $CXX -Xlinker -version-script=version-script.map main.c 2>&5 >&5; then
1.16378 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.16379 -$as_echo "no" >&6; }
1.16380 - USING_BROKEN_SUSE_LD=no
1.16381 - else
1.16382 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.16383 -$as_echo "yes" >&6; }
1.16384 - USING_BROKEN_SUSE_LD=yes
1.16385 - fi
1.16386 - rm -rf version-script.map main.c
1.16387 - fi
1.16388 -
1.16389 -
1.16390 -
1.16391 # Setup debug symbols (need objcopy from the toolchain for that)
1.16392
1.16393 #
1.16394 @@ -40814,8 +40956,6 @@
1.16395
1.16396
1.16397
1.16398 -
1.16399 -
1.16400 ###############################################################################
1.16401 #
1.16402 # Check dependencies for external and internal libraries.
1.16403 @@ -46225,18 +46365,469 @@
1.16404 fi
1.16405
1.16406 # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
1.16407 - if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x; then
1.16408 + if test "x$TOOLCHAIN_TYPE" = xsolstudio && test "x$LIBCXX" = x; then
1.16409 LIBCXX="/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
1.16410 fi
1.16411
1.16412 # TODO better (platform agnostic) test
1.16413 - if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$LIBCXX" = x && test "x$GCC" = xyes; then
1.16414 + if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$LIBCXX" = x && test "x$TOOLCHAIN_TYPE" = xgcc; then
1.16415 LIBCXX="-lstdc++"
1.16416 fi
1.16417
1.16418
1.16419
1.16420
1.16421 + if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.16422 +
1.16423 +
1.16424 +# Check whether --with-msvcr-dll was given.
1.16425 +if test "${with_msvcr_dll+set}" = set; then :
1.16426 + withval=$with_msvcr_dll;
1.16427 +fi
1.16428 +
1.16429 +
1.16430 + if test "x$with_msvcr_dll" != x; then
1.16431 + # If given explicitely by user, do not probe. If not present, fail directly.
1.16432 +
1.16433 + POSSIBLE_MSVCR_DLL="$with_msvcr_dll"
1.16434 + METHOD="--with-msvcr-dll"
1.16435 + if test -e "$POSSIBLE_MSVCR_DLL"; then
1.16436 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
1.16437 +$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
1.16438 +
1.16439 + # Need to check if the found msvcr is correct architecture
1.16440 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.16441 +$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.16442 + MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.16443 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.16444 + CORRECT_MSVCR_ARCH=386
1.16445 + else
1.16446 + CORRECT_MSVCR_ARCH=x86-64
1.16447 + fi
1.16448 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.16449 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.16450 +$as_echo "ok" >&6; }
1.16451 + MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.16452 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.16453 +$as_echo_n "checking for msvcr100.dll... " >&6; }
1.16454 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
1.16455 +$as_echo "$MSVCR_DLL" >&6; }
1.16456 + else
1.16457 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.16458 +$as_echo "incorrect, ignoring" >&6; }
1.16459 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
1.16460 +$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
1.16461 + fi
1.16462 + fi
1.16463 +
1.16464 + if test "x$MSVCR_DLL" = x; then
1.16465 + as_fn_error $? "Could not find a proper msvcr100.dll as specified by --with-msvcr-dll" "$LINENO" 5
1.16466 + fi
1.16467 + fi
1.16468 +
1.16469 + if test "x$MSVCR_DLL" = x; then
1.16470 + # Probe: Using well-known location from Visual Studio 10.0
1.16471 + if test "x$VCINSTALLDIR" != x; then
1.16472 + CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR"
1.16473 +
1.16474 + windows_path="$CYGWIN_VC_INSTALL_DIR"
1.16475 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.16476 + unix_path=`$CYGPATH -u "$windows_path"`
1.16477 + CYGWIN_VC_INSTALL_DIR="$unix_path"
1.16478 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.16479 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.16480 + CYGWIN_VC_INSTALL_DIR="$unix_path"
1.16481 + fi
1.16482 +
1.16483 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.16484 + POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC100.CRT/msvcr100.dll"
1.16485 + else
1.16486 + POSSIBLE_MSVCR_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC100.CRT/msvcr100.dll"
1.16487 + fi
1.16488 +
1.16489 + POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.16490 + METHOD="well-known location in VCINSTALLDIR"
1.16491 + if test -e "$POSSIBLE_MSVCR_DLL"; then
1.16492 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
1.16493 +$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
1.16494 +
1.16495 + # Need to check if the found msvcr is correct architecture
1.16496 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.16497 +$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.16498 + MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.16499 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.16500 + CORRECT_MSVCR_ARCH=386
1.16501 + else
1.16502 + CORRECT_MSVCR_ARCH=x86-64
1.16503 + fi
1.16504 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.16505 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.16506 +$as_echo "ok" >&6; }
1.16507 + MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.16508 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.16509 +$as_echo_n "checking for msvcr100.dll... " >&6; }
1.16510 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
1.16511 +$as_echo "$MSVCR_DLL" >&6; }
1.16512 + else
1.16513 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.16514 +$as_echo "incorrect, ignoring" >&6; }
1.16515 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
1.16516 +$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
1.16517 + fi
1.16518 + fi
1.16519 +
1.16520 + fi
1.16521 + fi
1.16522 +
1.16523 + if test "x$MSVCR_DLL" = x; then
1.16524 + # Probe: Check in the Boot JDK directory.
1.16525 + POSSIBLE_MSVCR_DLL="$BOOT_JDK/bin/msvcr100.dll"
1.16526 +
1.16527 + POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.16528 + METHOD="well-known location in Boot JDK"
1.16529 + if test -e "$POSSIBLE_MSVCR_DLL"; then
1.16530 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
1.16531 +$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
1.16532 +
1.16533 + # Need to check if the found msvcr is correct architecture
1.16534 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.16535 +$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.16536 + MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.16537 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.16538 + CORRECT_MSVCR_ARCH=386
1.16539 + else
1.16540 + CORRECT_MSVCR_ARCH=x86-64
1.16541 + fi
1.16542 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.16543 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.16544 +$as_echo "ok" >&6; }
1.16545 + MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.16546 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.16547 +$as_echo_n "checking for msvcr100.dll... " >&6; }
1.16548 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
1.16549 +$as_echo "$MSVCR_DLL" >&6; }
1.16550 + else
1.16551 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.16552 +$as_echo "incorrect, ignoring" >&6; }
1.16553 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
1.16554 +$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
1.16555 + fi
1.16556 + fi
1.16557 +
1.16558 + fi
1.16559 +
1.16560 + if test "x$MSVCR_DLL" = x; then
1.16561 + # Probe: Look in the Windows system32 directory
1.16562 + CYGWIN_SYSTEMROOT="$SYSTEMROOT"
1.16563 +
1.16564 + windows_path="$CYGWIN_SYSTEMROOT"
1.16565 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.16566 + unix_path=`$CYGPATH -u "$windows_path"`
1.16567 + CYGWIN_SYSTEMROOT="$unix_path"
1.16568 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.16569 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.16570 + CYGWIN_SYSTEMROOT="$unix_path"
1.16571 + fi
1.16572 +
1.16573 + POSSIBLE_MSVCR_DLL="$CYGWIN_SYSTEMROOT/system32/msvcr100.dll"
1.16574 +
1.16575 + POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.16576 + METHOD="well-known location in SYSTEMROOT"
1.16577 + if test -e "$POSSIBLE_MSVCR_DLL"; then
1.16578 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
1.16579 +$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
1.16580 +
1.16581 + # Need to check if the found msvcr is correct architecture
1.16582 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.16583 +$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.16584 + MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.16585 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.16586 + CORRECT_MSVCR_ARCH=386
1.16587 + else
1.16588 + CORRECT_MSVCR_ARCH=x86-64
1.16589 + fi
1.16590 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.16591 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.16592 +$as_echo "ok" >&6; }
1.16593 + MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.16594 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.16595 +$as_echo_n "checking for msvcr100.dll... " >&6; }
1.16596 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
1.16597 +$as_echo "$MSVCR_DLL" >&6; }
1.16598 + else
1.16599 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.16600 +$as_echo "incorrect, ignoring" >&6; }
1.16601 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
1.16602 +$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
1.16603 + fi
1.16604 + fi
1.16605 +
1.16606 + fi
1.16607 +
1.16608 + if test "x$MSVCR_DLL" = x; then
1.16609 + # Probe: If Visual Studio Express is installed, there is usually one with the debugger
1.16610 + if test "x$VS100COMNTOOLS" != x; then
1.16611 + CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
1.16612 +
1.16613 + windows_path="$CYGWIN_VS_TOOLS_DIR"
1.16614 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.16615 + unix_path=`$CYGPATH -u "$windows_path"`
1.16616 + CYGWIN_VS_TOOLS_DIR="$unix_path"
1.16617 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.16618 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.16619 + CYGWIN_VS_TOOLS_DIR="$unix_path"
1.16620 + fi
1.16621 +
1.16622 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.16623 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x64/ | $HEAD --lines 1`
1.16624 + else
1.16625 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcr100.dll | $GREP -i /x86/ | $HEAD --lines 1`
1.16626 + fi
1.16627 +
1.16628 + POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.16629 + METHOD="search of VS100COMNTOOLS"
1.16630 + if test -e "$POSSIBLE_MSVCR_DLL"; then
1.16631 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
1.16632 +$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
1.16633 +
1.16634 + # Need to check if the found msvcr is correct architecture
1.16635 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.16636 +$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.16637 + MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.16638 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.16639 + CORRECT_MSVCR_ARCH=386
1.16640 + else
1.16641 + CORRECT_MSVCR_ARCH=x86-64
1.16642 + fi
1.16643 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.16644 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.16645 +$as_echo "ok" >&6; }
1.16646 + MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.16647 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.16648 +$as_echo_n "checking for msvcr100.dll... " >&6; }
1.16649 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
1.16650 +$as_echo "$MSVCR_DLL" >&6; }
1.16651 + else
1.16652 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.16653 +$as_echo "incorrect, ignoring" >&6; }
1.16654 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
1.16655 +$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
1.16656 + fi
1.16657 + fi
1.16658 +
1.16659 + fi
1.16660 + fi
1.16661 +
1.16662 + if test "x$MSVCR_DLL" = x; then
1.16663 + # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now.
1.16664 + # (This was the original behaviour; kept since it might turn up something)
1.16665 + if test "x$CYGWIN_VC_INSTALL_DIR" != x; then
1.16666 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.16667 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x64 | $HEAD --lines 1`
1.16668 + else
1.16669 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
1.16670 + if test "x$POSSIBLE_MSVCR_DLL" = x; then
1.16671 + # We're grasping at straws now...
1.16672 + POSSIBLE_MSVCR_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcr100.dll | $HEAD --lines 1`
1.16673 + fi
1.16674 + fi
1.16675 +
1.16676 +
1.16677 + POSSIBLE_MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.16678 + METHOD="search of VCINSTALLDIR"
1.16679 + if test -e "$POSSIBLE_MSVCR_DLL"; then
1.16680 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&5
1.16681 +$as_echo "$as_me: Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD" >&6;}
1.16682 +
1.16683 + # Need to check if the found msvcr is correct architecture
1.16684 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.16685 +$as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.16686 + MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.16687 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.16688 + CORRECT_MSVCR_ARCH=386
1.16689 + else
1.16690 + CORRECT_MSVCR_ARCH=x86-64
1.16691 + fi
1.16692 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.16693 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.16694 +$as_echo "ok" >&6; }
1.16695 + MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.16696 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.16697 +$as_echo_n "checking for msvcr100.dll... " >&6; }
1.16698 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVCR_DLL" >&5
1.16699 +$as_echo "$MSVCR_DLL" >&6; }
1.16700 + else
1.16701 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.16702 +$as_echo "incorrect, ignoring" >&6; }
1.16703 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&5
1.16704 +$as_echo "$as_me: The file type of the located msvcr100.dll is $MSVCR_DLL_FILETYPE" >&6;}
1.16705 + fi
1.16706 + fi
1.16707 +
1.16708 + fi
1.16709 + fi
1.16710 +
1.16711 + if test "x$MSVCR_DLL" = x; then
1.16712 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for msvcr100.dll" >&5
1.16713 +$as_echo_n "checking for msvcr100.dll... " >&6; }
1.16714 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.16715 +$as_echo "no" >&6; }
1.16716 + as_fn_error $? "Could not find msvcr100.dll. Please specify using --with-msvcr-dll." "$LINENO" 5
1.16717 + fi
1.16718 +
1.16719 +
1.16720 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.16721 +
1.16722 + # Input might be given as Windows format, start by converting to
1.16723 + # unix format.
1.16724 + path="$MSVCR_DLL"
1.16725 + new_path=`$CYGPATH -u "$path"`
1.16726 +
1.16727 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.16728 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.16729 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.16730 + # "foo.exe" is OK but "foo" is an error.
1.16731 + #
1.16732 + # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.16733 + # It is also a way to make sure we got the proper file name for the real test later on.
1.16734 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.16735 + if test "x$test_shortpath" = x; then
1.16736 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&5
1.16737 +$as_echo "$as_me: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&6;}
1.16738 + as_fn_error $? "Cannot locate the the path of MSVCR_DLL" "$LINENO" 5
1.16739 + fi
1.16740 +
1.16741 + # Call helper function which possibly converts this using DOS-style short mode.
1.16742 + # If so, the updated path is stored in $new_path.
1.16743 +
1.16744 + input_path="$new_path"
1.16745 + # Check if we need to convert this using DOS-style short mode. If the path
1.16746 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.16747 + # take no chances and rewrite it.
1.16748 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.16749 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.16750 + if test "x$has_forbidden_chars" != x; then
1.16751 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.16752 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.16753 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.16754 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.16755 + # Going to short mode and back again did indeed matter. Since short mode is
1.16756 + # case insensitive, let's make it lowercase to improve readability.
1.16757 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.16758 + # Now convert it back to Unix-stile (cygpath)
1.16759 + input_path=`$CYGPATH -u "$shortmode_path"`
1.16760 + new_path="$input_path"
1.16761 + fi
1.16762 + fi
1.16763 +
1.16764 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.16765 + if test "x$test_cygdrive_prefix" = x; then
1.16766 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.16767 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.16768 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.16769 + # a path prefixed by /cygdrive for fixpath to work.
1.16770 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.16771 + fi
1.16772 + fi
1.16773 +
1.16774 +
1.16775 + if test "x$path" != "x$new_path"; then
1.16776 + MSVCR_DLL="$new_path"
1.16777 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVCR_DLL to \"$new_path\"" >&5
1.16778 +$as_echo "$as_me: Rewriting MSVCR_DLL to \"$new_path\"" >&6;}
1.16779 + fi
1.16780 +
1.16781 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.16782 +
1.16783 + path="$MSVCR_DLL"
1.16784 + has_colon=`$ECHO $path | $GREP ^.:`
1.16785 + new_path="$path"
1.16786 + if test "x$has_colon" = x; then
1.16787 + # Not in mixed or Windows style, start by that.
1.16788 + new_path=`cmd //c echo $path`
1.16789 + fi
1.16790 +
1.16791 +
1.16792 + input_path="$new_path"
1.16793 + # Check if we need to convert this using DOS-style short mode. If the path
1.16794 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.16795 + # take no chances and rewrite it.
1.16796 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.16797 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.16798 + if test "x$has_forbidden_chars" != x; then
1.16799 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.16800 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.16801 + fi
1.16802 +
1.16803 +
1.16804 + windows_path="$new_path"
1.16805 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.16806 + unix_path=`$CYGPATH -u "$windows_path"`
1.16807 + new_path="$unix_path"
1.16808 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.16809 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.16810 + new_path="$unix_path"
1.16811 + fi
1.16812 +
1.16813 + if test "x$path" != "x$new_path"; then
1.16814 + MSVCR_DLL="$new_path"
1.16815 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVCR_DLL to \"$new_path\"" >&5
1.16816 +$as_echo "$as_me: Rewriting MSVCR_DLL to \"$new_path\"" >&6;}
1.16817 + fi
1.16818 +
1.16819 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.16820 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.16821 +
1.16822 + else
1.16823 + # We're on a posix platform. Hooray! :)
1.16824 + path="$MSVCR_DLL"
1.16825 + has_space=`$ECHO "$path" | $GREP " "`
1.16826 + if test "x$has_space" != x; then
1.16827 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&5
1.16828 +$as_echo "$as_me: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&6;}
1.16829 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.16830 + fi
1.16831 +
1.16832 + # Use eval to expand a potential ~
1.16833 + eval path="$path"
1.16834 + if test ! -f "$path" && test ! -d "$path"; then
1.16835 + as_fn_error $? "The path of MSVCR_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.16836 + fi
1.16837 +
1.16838 + MSVCR_DLL="`cd "$path"; $THEPWDCMD -L`"
1.16839 + fi
1.16840 +
1.16841 +
1.16842 +
1.16843 +
1.16844 +# Check whether --with-dxsdk was given.
1.16845 +if test "${with_dxsdk+set}" = set; then :
1.16846 + withval=$with_dxsdk; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-dxsdk is deprecated and will be ignored." >&5
1.16847 +$as_echo "$as_me: WARNING: Option --with-dxsdk is deprecated and will be ignored." >&2;}
1.16848 +fi
1.16849 +
1.16850 +
1.16851 +
1.16852 +
1.16853 +# Check whether --with-dxsdk-lib was given.
1.16854 +if test "${with_dxsdk_lib+set}" = set; then :
1.16855 + withval=$with_dxsdk_lib; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-dxsdk-lib is deprecated and will be ignored." >&5
1.16856 +$as_echo "$as_me: WARNING: Option --with-dxsdk-lib is deprecated and will be ignored." >&2;}
1.16857 +fi
1.16858 +
1.16859 +
1.16860 +
1.16861 +
1.16862 +# Check whether --with-dxsdk-include was given.
1.16863 +if test "${with_dxsdk_include+set}" = set; then :
1.16864 + withval=$with_dxsdk_include; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-dxsdk-include is deprecated and will be ignored." >&5
1.16865 +$as_echo "$as_me: WARNING: Option --with-dxsdk-include is deprecated and will be ignored." >&2;}
1.16866 +fi
1.16867 +
1.16868 +
1.16869 + fi
1.16870 +
1.16871 +
1.16872
1.16873 ###############################################################################
1.16874 #
1.16875 @@ -46664,7 +47255,7 @@
1.16876
1.16877 if test "x$ENABLE_PRECOMPH" = xyes; then
1.16878 # Check that the compiler actually supports precomp headers.
1.16879 - if test "x$GCC" = xyes; then
1.16880 + if test "x$TOOLCHAIN_TYPE" = xgcc; then
1.16881 { $as_echo "$as_me:${as_lineno-$LINENO}: checking that precompiled headers work" >&5
1.16882 $as_echo_n "checking that precompiled headers work... " >&6; }
1.16883 echo "int alfa();" > conftest.h
1.16884 @@ -48385,8 +48976,9 @@
1.16885 printf "* Environment: $WINDOWS_ENV_VENDOR version $WINDOWS_ENV_VERSION (root at $WINDOWS_ENV_ROOT_PATH)\n"
1.16886 fi
1.16887 printf "* Boot JDK: $BOOT_JDK_VERSION (at $BOOT_JDK)\n"
1.16888 - printf "* C Compiler: $CC_VENDOR version $CC_VERSION (at $CC)\n"
1.16889 - printf "* C++ Compiler: $CXX_VENDOR version $CXX_VERSION (at $CXX)\n"
1.16890 + printf "* Toolchain: $TOOLCHAIN_TYPE ($TOOLCHAIN_DESCRIPTION)\n"
1.16891 + printf "* C Compiler: Version $CC_VERSION_NUMBER (at $CC)\n"
1.16892 + printf "* C++ Compiler: Version $CXX_VERSION_NUMBER (at $CXX)\n"
1.16893
1.16894 printf "\n"
1.16895 printf "Build performance summary:\n"
