Mercurial > jdk8-mips64-public / changeset
changeset
8022177: Windows/MSYS builds broken
Tue, 17 Apr 2018 09:33:36 -0700
- author
- kevinw
- date
- Tue, 17 Apr 2018 09:33:36 -0700
- changeset 2219
- cb1203f48728
- parent 2216
- 0c4c976612d3
- child 2220
- 47fda751abb6
8022177: Windows/MSYS builds broken
Reviewed-by: erikj, tbell, erikj, simonis
Contributed-by: volker.simonis@gmail.com, erik.joelsson@oracle.com
1.1 --- a/common/autoconf/basics.m4 Wed Apr 18 12:37:18 2018 -0700 1.2 +++ b/common/autoconf/basics.m4 Tue Apr 17 09:33:36 2018 -0700 1.3 @@ -377,7 +377,6 @@ 1.4 BASIC_REQUIRE_PROGS(CMP, cmp) 1.5 BASIC_REQUIRE_PROGS(COMM, comm) 1.6 BASIC_REQUIRE_PROGS(CP, cp) 1.7 - BASIC_REQUIRE_PROGS(CPIO, cpio) 1.8 BASIC_REQUIRE_PROGS(CUT, cut) 1.9 BASIC_REQUIRE_PROGS(DATE, date) 1.10 BASIC_REQUIRE_PROGS(DIFF, [gdiff diff]) 1.11 @@ -427,6 +426,7 @@ 1.12 BASIC_PATH_PROGS(READLINK, [greadlink readlink]) 1.13 BASIC_PATH_PROGS(DF, df) 1.14 BASIC_PATH_PROGS(SETFILE, SetFile) 1.15 + BASIC_PATH_PROGS(CPIO, [cpio bsdcpio]) 1.16 ]) 1.17 1.18 # Setup basic configuration paths, and platform-specific stuff related to PATHs. 1.19 @@ -859,7 +859,7 @@ 1.20 # not be the case in cygwin in certain conditions. 1.21 AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS], 1.22 [ 1.23 - if test x"$OPENJDK_BUILD_OS" = xwindows; then 1.24 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 1.25 file_to_test="$SRC_ROOT/LICENSE" 1.26 if test `$STAT -c '%a' "$file_to_test"` -lt 400; then 1.27 AC_MSG_ERROR([Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin.])
2.1 --- a/common/autoconf/basics_windows.m4 Wed Apr 18 12:37:18 2018 -0700 2.2 +++ b/common/autoconf/basics_windows.m4 Tue Apr 17 09:33:36 2018 -0700 2.3 @@ -266,6 +266,14 @@ 2.4 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path) 2.5 2.6 new_path=`$WHICH "$new_path" 2> /dev/null` 2.7 + # bat and cmd files are not always considered executable in MSYS causing which 2.8 + # to not find them 2.9 + if test "x$new_path" = x \ 2.10 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 2.11 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 2.12 + new_path="$path" 2.13 + BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path) 2.14 + fi 2.15 2.16 if test "x$new_path" = x; then 2.17 # It's still not found. Now this is an unrecoverable error.
3.1 --- a/common/autoconf/generated-configure.sh Wed Apr 18 12:37:18 2018 -0700 3.2 +++ b/common/autoconf/generated-configure.sh Tue Apr 17 09:33:36 2018 -0700 3.3 @@ -907,12 +907,14 @@ 3.4 OPENJDK_TARGET_CPU_BITS 3.5 OPENJDK_TARGET_CPU_ARCH 3.6 OPENJDK_TARGET_CPU 3.7 +OPENJDK_TARGET_OS_ENV 3.8 OPENJDK_TARGET_OS_API 3.9 OPENJDK_TARGET_OS 3.10 OPENJDK_BUILD_CPU_ENDIAN 3.11 OPENJDK_BUILD_CPU_BITS 3.12 OPENJDK_BUILD_CPU_ARCH 3.13 OPENJDK_BUILD_CPU 3.14 +OPENJDK_BUILD_OS_ENV 3.15 OPENJDK_BUILD_OS_API 3.16 OPENJDK_BUILD_OS 3.17 OPENJDK_BUILD_AUTOCONF_NAME 3.18 @@ -929,6 +931,7 @@ 3.19 build_vendor 3.20 build_cpu 3.21 build 3.22 +CPIO 3.23 SETFILE 3.24 DF 3.25 READLINK 3.26 @@ -967,7 +970,6 @@ 3.27 DIFF 3.28 DATE 3.29 CUT 3.30 -CPIO 3.31 CP 3.32 COMM 3.33 CMP 3.34 @@ -1105,7 +1107,6 @@ 3.35 CMP 3.36 COMM 3.37 CP 3.38 -CPIO 3.39 CUT 3.40 DATE 3.41 DIFF 3.42 @@ -1144,6 +1145,7 @@ 3.43 READLINK 3.44 DF 3.45 SETFILE 3.46 +CPIO 3.47 UNZIP 3.48 ZIP 3.49 LDD 3.50 @@ -1957,7 +1959,6 @@ 3.51 CMP Override default value for CMP 3.52 COMM Override default value for COMM 3.53 CP Override default value for CP 3.54 - CPIO Override default value for CPIO 3.55 CUT Override default value for CUT 3.56 DATE Override default value for DATE 3.57 DIFF Override default value for DIFF 3.58 @@ -1996,6 +1997,7 @@ 3.59 READLINK Override default value for READLINK 3.60 DF Override default value for DF 3.61 SETFILE Override default value for SETFILE 3.62 + CPIO Override default value for CPIO 3.63 UNZIP Override default value for UNZIP 3.64 ZIP Override default value for ZIP 3.65 LDD Override default value for LDD 3.66 @@ -4235,7 +4237,7 @@ 3.67 #CUSTOM_AUTOCONF_INCLUDE 3.68 3.69 # Do not change or remove the following line, it is needed for consistency checks: 3.70 -DATE_WHEN_GENERATED=1523864865 3.71 +DATE_WHEN_GENERATED=1523982801 3.72 3.73 ############################################################################### 3.74 # 3.75 @@ -5640,199 +5642,6 @@ 3.76 # Publish this variable in the help. 3.77 3.78 3.79 - if test "x$CPIO" = x; then 3.80 - # The variable is not set by user, try to locate tool using the code snippet 3.81 - for ac_prog in cpio 3.82 -do 3.83 - # Extract the first word of "$ac_prog", so it can be a program name with args. 3.84 -set dummy $ac_prog; ac_word=$2 3.85 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.86 -$as_echo_n "checking for $ac_word... " >&6; } 3.87 -if ${ac_cv_path_CPIO+:} false; then : 3.88 - $as_echo_n "(cached) " >&6 3.89 -else 3.90 - case $CPIO in 3.91 - [\\/]* | ?:[\\/]*) 3.92 - ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path. 3.93 - ;; 3.94 - *) 3.95 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3.96 -for as_dir in $PATH 3.97 -do 3.98 - IFS=$as_save_IFS 3.99 - test -z "$as_dir" && as_dir=. 3.100 - for ac_exec_ext in '' $ac_executable_extensions; do 3.101 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3.102 - ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext" 3.103 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.104 - break 2 3.105 - fi 3.106 -done 3.107 - done 3.108 -IFS=$as_save_IFS 3.109 - 3.110 - ;; 3.111 -esac 3.112 -fi 3.113 -CPIO=$ac_cv_path_CPIO 3.114 -if test -n "$CPIO"; then 3.115 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5 3.116 -$as_echo "$CPIO" >&6; } 3.117 -else 3.118 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 3.119 -$as_echo "no" >&6; } 3.120 -fi 3.121 - 3.122 - 3.123 - test -n "$CPIO" && break 3.124 -done 3.125 - 3.126 - else 3.127 - # The variable is set, but is it from the command line or the environment? 3.128 - 3.129 - # Try to remove the string !CPIO! from our list. 3.130 - try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CPIO!/} 3.131 - if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then 3.132 - # If it failed, the variable was not from the command line. Ignore it, 3.133 - # but warn the user (except for BASH, which is always set by the calling BASH). 3.134 - if test "xCPIO" != xBASH; then 3.135 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CPIO from the environment. Use command line variables instead." >&5 3.136 -$as_echo "$as_me: WARNING: Ignoring value of CPIO from the environment. Use command line variables instead." >&2;} 3.137 - fi 3.138 - # Try to locate tool using the code snippet 3.139 - for ac_prog in cpio 3.140 -do 3.141 - # Extract the first word of "$ac_prog", so it can be a program name with args. 3.142 -set dummy $ac_prog; ac_word=$2 3.143 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.144 -$as_echo_n "checking for $ac_word... " >&6; } 3.145 -if ${ac_cv_path_CPIO+:} false; then : 3.146 - $as_echo_n "(cached) " >&6 3.147 -else 3.148 - case $CPIO in 3.149 - [\\/]* | ?:[\\/]*) 3.150 - ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path. 3.151 - ;; 3.152 - *) 3.153 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3.154 -for as_dir in $PATH 3.155 -do 3.156 - IFS=$as_save_IFS 3.157 - test -z "$as_dir" && as_dir=. 3.158 - for ac_exec_ext in '' $ac_executable_extensions; do 3.159 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3.160 - ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext" 3.161 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.162 - break 2 3.163 - fi 3.164 -done 3.165 - done 3.166 -IFS=$as_save_IFS 3.167 - 3.168 - ;; 3.169 -esac 3.170 -fi 3.171 -CPIO=$ac_cv_path_CPIO 3.172 -if test -n "$CPIO"; then 3.173 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5 3.174 -$as_echo "$CPIO" >&6; } 3.175 -else 3.176 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 3.177 -$as_echo "no" >&6; } 3.178 -fi 3.179 - 3.180 - 3.181 - test -n "$CPIO" && break 3.182 -done 3.183 - 3.184 - else 3.185 - # If it succeeded, then it was overridden by the user. We will use it 3.186 - # for the tool. 3.187 - 3.188 - # First remove it from the list of overridden variables, so we can test 3.189 - # for unknown variables in the end. 3.190 - CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var" 3.191 - 3.192 - # Check if the provided tool contains a complete path. 3.193 - tool_specified="$CPIO" 3.194 - tool_basename="${tool_specified##*/}" 3.195 - if test "x$tool_basename" = "x$tool_specified"; then 3.196 - # A command without a complete path is provided, search $PATH. 3.197 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CPIO=$tool_basename" >&5 3.198 -$as_echo "$as_me: Will search for user supplied tool CPIO=$tool_basename" >&6;} 3.199 - # Extract the first word of "$tool_basename", so it can be a program name with args. 3.200 -set dummy $tool_basename; ac_word=$2 3.201 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.202 -$as_echo_n "checking for $ac_word... " >&6; } 3.203 -if ${ac_cv_path_CPIO+:} false; then : 3.204 - $as_echo_n "(cached) " >&6 3.205 -else 3.206 - case $CPIO in 3.207 - [\\/]* | ?:[\\/]*) 3.208 - ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path. 3.209 - ;; 3.210 - *) 3.211 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3.212 -for as_dir in $PATH 3.213 -do 3.214 - IFS=$as_save_IFS 3.215 - test -z "$as_dir" && as_dir=. 3.216 - for ac_exec_ext in '' $ac_executable_extensions; do 3.217 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3.218 - ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext" 3.219 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.220 - break 2 3.221 - fi 3.222 -done 3.223 - done 3.224 -IFS=$as_save_IFS 3.225 - 3.226 - ;; 3.227 -esac 3.228 -fi 3.229 -CPIO=$ac_cv_path_CPIO 3.230 -if test -n "$CPIO"; then 3.231 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5 3.232 -$as_echo "$CPIO" >&6; } 3.233 -else 3.234 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 3.235 -$as_echo "no" >&6; } 3.236 -fi 3.237 - 3.238 - 3.239 - if test "x$CPIO" = x; then 3.240 - as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5 3.241 - fi 3.242 - else 3.243 - # Otherwise we believe it is a complete path. Use it as it is. 3.244 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CPIO=$tool_specified" >&5 3.245 -$as_echo "$as_me: Will use user supplied tool CPIO=$tool_specified" >&6;} 3.246 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPIO" >&5 3.247 -$as_echo_n "checking for CPIO... " >&6; } 3.248 - if test ! -x "$tool_specified"; then 3.249 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 3.250 -$as_echo "not found" >&6; } 3.251 - as_fn_error $? "User supplied tool CPIO=$tool_specified does not exist or is not executable" "$LINENO" 5 3.252 - fi 3.253 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5 3.254 -$as_echo "$tool_specified" >&6; } 3.255 - fi 3.256 - fi 3.257 - fi 3.258 - 3.259 - 3.260 - 3.261 - if test "x$CPIO" = x; then 3.262 - as_fn_error $? "Could not find required tool for CPIO" "$LINENO" 5 3.263 - fi 3.264 - 3.265 - 3.266 - 3.267 - 3.268 - 3.269 - # Publish this variable in the help. 3.270 - 3.271 - 3.272 if test "x$CUT" = x; then 3.273 # The variable is not set by user, try to locate tool using the code snippet 3.274 for ac_prog in cut 3.275 @@ -13302,6 +13111,192 @@ 3.276 3.277 3.278 3.279 + # Publish this variable in the help. 3.280 + 3.281 + 3.282 + if test "x$CPIO" = x; then 3.283 + # The variable is not set by user, try to locate tool using the code snippet 3.284 + for ac_prog in cpio bsdcpio 3.285 +do 3.286 + # Extract the first word of "$ac_prog", so it can be a program name with args. 3.287 +set dummy $ac_prog; ac_word=$2 3.288 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.289 +$as_echo_n "checking for $ac_word... " >&6; } 3.290 +if ${ac_cv_path_CPIO+:} false; then : 3.291 + $as_echo_n "(cached) " >&6 3.292 +else 3.293 + case $CPIO in 3.294 + [\\/]* | ?:[\\/]*) 3.295 + ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path. 3.296 + ;; 3.297 + *) 3.298 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3.299 +for as_dir in $PATH 3.300 +do 3.301 + IFS=$as_save_IFS 3.302 + test -z "$as_dir" && as_dir=. 3.303 + for ac_exec_ext in '' $ac_executable_extensions; do 3.304 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3.305 + ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext" 3.306 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.307 + break 2 3.308 + fi 3.309 +done 3.310 + done 3.311 +IFS=$as_save_IFS 3.312 + 3.313 + ;; 3.314 +esac 3.315 +fi 3.316 +CPIO=$ac_cv_path_CPIO 3.317 +if test -n "$CPIO"; then 3.318 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5 3.319 +$as_echo "$CPIO" >&6; } 3.320 +else 3.321 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 3.322 +$as_echo "no" >&6; } 3.323 +fi 3.324 + 3.325 + 3.326 + test -n "$CPIO" && break 3.327 +done 3.328 + 3.329 + else 3.330 + # The variable is set, but is it from the command line or the environment? 3.331 + 3.332 + # Try to remove the string !CPIO! from our list. 3.333 + try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CPIO!/} 3.334 + if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then 3.335 + # If it failed, the variable was not from the command line. Ignore it, 3.336 + # but warn the user (except for BASH, which is always set by the calling BASH). 3.337 + if test "xCPIO" != xBASH; then 3.338 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CPIO from the environment. Use command line variables instead." >&5 3.339 +$as_echo "$as_me: WARNING: Ignoring value of CPIO from the environment. Use command line variables instead." >&2;} 3.340 + fi 3.341 + # Try to locate tool using the code snippet 3.342 + for ac_prog in cpio bsdcpio 3.343 +do 3.344 + # Extract the first word of "$ac_prog", so it can be a program name with args. 3.345 +set dummy $ac_prog; ac_word=$2 3.346 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.347 +$as_echo_n "checking for $ac_word... " >&6; } 3.348 +if ${ac_cv_path_CPIO+:} false; then : 3.349 + $as_echo_n "(cached) " >&6 3.350 +else 3.351 + case $CPIO in 3.352 + [\\/]* | ?:[\\/]*) 3.353 + ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path. 3.354 + ;; 3.355 + *) 3.356 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3.357 +for as_dir in $PATH 3.358 +do 3.359 + IFS=$as_save_IFS 3.360 + test -z "$as_dir" && as_dir=. 3.361 + for ac_exec_ext in '' $ac_executable_extensions; do 3.362 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3.363 + ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext" 3.364 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.365 + break 2 3.366 + fi 3.367 +done 3.368 + done 3.369 +IFS=$as_save_IFS 3.370 + 3.371 + ;; 3.372 +esac 3.373 +fi 3.374 +CPIO=$ac_cv_path_CPIO 3.375 +if test -n "$CPIO"; then 3.376 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5 3.377 +$as_echo "$CPIO" >&6; } 3.378 +else 3.379 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 3.380 +$as_echo "no" >&6; } 3.381 +fi 3.382 + 3.383 + 3.384 + test -n "$CPIO" && break 3.385 +done 3.386 + 3.387 + else 3.388 + # If it succeeded, then it was overridden by the user. We will use it 3.389 + # for the tool. 3.390 + 3.391 + # First remove it from the list of overridden variables, so we can test 3.392 + # for unknown variables in the end. 3.393 + CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var" 3.394 + 3.395 + # Check if the provided tool contains a complete path. 3.396 + tool_specified="$CPIO" 3.397 + tool_basename="${tool_specified##*/}" 3.398 + if test "x$tool_basename" = "x$tool_specified"; then 3.399 + # A command without a complete path is provided, search $PATH. 3.400 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CPIO=$tool_basename" >&5 3.401 +$as_echo "$as_me: Will search for user supplied tool CPIO=$tool_basename" >&6;} 3.402 + # Extract the first word of "$tool_basename", so it can be a program name with args. 3.403 +set dummy $tool_basename; ac_word=$2 3.404 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.405 +$as_echo_n "checking for $ac_word... " >&6; } 3.406 +if ${ac_cv_path_CPIO+:} false; then : 3.407 + $as_echo_n "(cached) " >&6 3.408 +else 3.409 + case $CPIO in 3.410 + [\\/]* | ?:[\\/]*) 3.411 + ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path. 3.412 + ;; 3.413 + *) 3.414 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3.415 +for as_dir in $PATH 3.416 +do 3.417 + IFS=$as_save_IFS 3.418 + test -z "$as_dir" && as_dir=. 3.419 + for ac_exec_ext in '' $ac_executable_extensions; do 3.420 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3.421 + ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext" 3.422 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 3.423 + break 2 3.424 + fi 3.425 +done 3.426 + done 3.427 +IFS=$as_save_IFS 3.428 + 3.429 + ;; 3.430 +esac 3.431 +fi 3.432 +CPIO=$ac_cv_path_CPIO 3.433 +if test -n "$CPIO"; then 3.434 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5 3.435 +$as_echo "$CPIO" >&6; } 3.436 +else 3.437 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 3.438 +$as_echo "no" >&6; } 3.439 +fi 3.440 + 3.441 + 3.442 + if test "x$CPIO" = x; then 3.443 + as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5 3.444 + fi 3.445 + else 3.446 + # Otherwise we believe it is a complete path. Use it as it is. 3.447 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CPIO=$tool_specified" >&5 3.448 +$as_echo "$as_me: Will use user supplied tool CPIO=$tool_specified" >&6;} 3.449 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPIO" >&5 3.450 +$as_echo_n "checking for CPIO... " >&6; } 3.451 + if test ! -x "$tool_specified"; then 3.452 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 3.453 +$as_echo "not found" >&6; } 3.454 + as_fn_error $? "User supplied tool CPIO=$tool_specified does not exist or is not executable" "$LINENO" 5 3.455 + fi 3.456 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5 3.457 +$as_echo "$tool_specified" >&6; } 3.458 + fi 3.459 + fi 3.460 + fi 3.461 + 3.462 + 3.463 + 3.464 + 3.465 # Now we can determine OpenJDK build and target platforms. This is required to 3.466 # have early on. 3.467 # Make sure we can run config.sub. 3.468 @@ -13566,6 +13561,7 @@ 3.469 3.470 3.471 3.472 + 3.473 { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-build os-cpu" >&5 3.474 $as_echo_n "checking openjdk-build os-cpu... " >&6; } 3.475 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&5 3.476 @@ -13703,6 +13699,7 @@ 3.477 3.478 3.479 3.480 + 3.481 { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-target os-cpu" >&5 3.482 $as_echo_n "checking openjdk-target os-cpu... " >&6; } 3.483 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&5 3.484 @@ -15400,6 +15397,23 @@ 3.485 3.486 3.487 new_path=`$WHICH "$new_path" 2> /dev/null` 3.488 + # bat and cmd files are not always considered executable in MSYS causing which 3.489 + # to not find them 3.490 + if test "x$new_path" = x \ 3.491 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.492 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.493 + new_path="$path" 3.494 + 3.495 + windows_path="$new_path" 3.496 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.497 + unix_path=`$CYGPATH -u "$windows_path"` 3.498 + new_path="$unix_path" 3.499 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.500 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.501 + new_path="$unix_path" 3.502 + fi 3.503 + 3.504 + fi 3.505 3.506 if test "x$new_path" = x; then 3.507 # It's still not found. Now this is an unrecoverable error. 3.508 @@ -15756,6 +15770,23 @@ 3.509 3.510 3.511 new_path=`$WHICH "$new_path" 2> /dev/null` 3.512 + # bat and cmd files are not always considered executable in MSYS causing which 3.513 + # to not find them 3.514 + if test "x$new_path" = x \ 3.515 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.516 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.517 + new_path="$path" 3.518 + 3.519 + windows_path="$new_path" 3.520 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.521 + unix_path=`$CYGPATH -u "$windows_path"` 3.522 + new_path="$unix_path" 3.523 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.524 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.525 + new_path="$unix_path" 3.526 + fi 3.527 + 3.528 + fi 3.529 3.530 if test "x$new_path" = x; then 3.531 # It's still not found. Now this is an unrecoverable error. 3.532 @@ -16109,6 +16140,23 @@ 3.533 3.534 3.535 new_path=`$WHICH "$new_path" 2> /dev/null` 3.536 + # bat and cmd files are not always considered executable in MSYS causing which 3.537 + # to not find them 3.538 + if test "x$new_path" = x \ 3.539 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.540 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.541 + new_path="$path" 3.542 + 3.543 + windows_path="$new_path" 3.544 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.545 + unix_path=`$CYGPATH -u "$windows_path"` 3.546 + new_path="$unix_path" 3.547 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.548 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.549 + new_path="$unix_path" 3.550 + fi 3.551 + 3.552 + fi 3.553 3.554 if test "x$new_path" = x; then 3.555 # It's still not found. Now this is an unrecoverable error. 3.556 @@ -16467,6 +16515,23 @@ 3.557 3.558 3.559 new_path=`$WHICH "$new_path" 2> /dev/null` 3.560 + # bat and cmd files are not always considered executable in MSYS causing which 3.561 + # to not find them 3.562 + if test "x$new_path" = x \ 3.563 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.564 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.565 + new_path="$path" 3.566 + 3.567 + windows_path="$new_path" 3.568 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.569 + unix_path=`$CYGPATH -u "$windows_path"` 3.570 + new_path="$unix_path" 3.571 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.572 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.573 + new_path="$unix_path" 3.574 + fi 3.575 + 3.576 + fi 3.577 3.578 if test "x$new_path" = x; then 3.579 # It's still not found. Now this is an unrecoverable error. 3.580 @@ -16819,6 +16884,23 @@ 3.581 3.582 3.583 new_path=`$WHICH "$new_path" 2> /dev/null` 3.584 + # bat and cmd files are not always considered executable in MSYS causing which 3.585 + # to not find them 3.586 + if test "x$new_path" = x \ 3.587 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.588 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.589 + new_path="$path" 3.590 + 3.591 + windows_path="$new_path" 3.592 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.593 + unix_path=`$CYGPATH -u "$windows_path"` 3.594 + new_path="$unix_path" 3.595 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.596 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.597 + new_path="$unix_path" 3.598 + fi 3.599 + 3.600 + fi 3.601 3.602 if test "x$new_path" = x; then 3.603 # It's still not found. Now this is an unrecoverable error. 3.604 @@ -25666,6 +25748,23 @@ 3.605 3.606 3.607 new_path=`$WHICH "$new_path" 2> /dev/null` 3.608 + # bat and cmd files are not always considered executable in MSYS causing which 3.609 + # to not find them 3.610 + if test "x$new_path" = x \ 3.611 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.612 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.613 + new_path="$path" 3.614 + 3.615 + windows_path="$new_path" 3.616 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.617 + unix_path=`$CYGPATH -u "$windows_path"` 3.618 + new_path="$unix_path" 3.619 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.620 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.621 + new_path="$unix_path" 3.622 + fi 3.623 + 3.624 + fi 3.625 3.626 if test "x$new_path" = x; then 3.627 # It's still not found. Now this is an unrecoverable error. 3.628 @@ -26436,6 +26535,23 @@ 3.629 3.630 3.631 new_path=`$WHICH "$new_path" 2> /dev/null` 3.632 + # bat and cmd files are not always considered executable in MSYS causing which 3.633 + # to not find them 3.634 + if test "x$new_path" = x \ 3.635 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.636 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.637 + new_path="$path" 3.638 + 3.639 + windows_path="$new_path" 3.640 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.641 + unix_path=`$CYGPATH -u "$windows_path"` 3.642 + new_path="$unix_path" 3.643 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.644 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.645 + new_path="$unix_path" 3.646 + fi 3.647 + 3.648 + fi 3.649 3.650 if test "x$new_path" = x; then 3.651 # It's still not found. Now this is an unrecoverable error. 3.652 @@ -26876,6 +26992,23 @@ 3.653 3.654 3.655 new_path=`$WHICH "$new_path" 2> /dev/null` 3.656 + # bat and cmd files are not always considered executable in MSYS causing which 3.657 + # to not find them 3.658 + if test "x$new_path" = x \ 3.659 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.660 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.661 + new_path="$path" 3.662 + 3.663 + windows_path="$new_path" 3.664 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.665 + unix_path=`$CYGPATH -u "$windows_path"` 3.666 + new_path="$unix_path" 3.667 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.668 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.669 + new_path="$unix_path" 3.670 + fi 3.671 + 3.672 + fi 3.673 3.674 if test "x$new_path" = x; then 3.675 # It's still not found. Now this is an unrecoverable error. 3.676 @@ -28144,6 +28277,23 @@ 3.677 3.678 3.679 new_path=`$WHICH "$new_path" 2> /dev/null` 3.680 + # bat and cmd files are not always considered executable in MSYS causing which 3.681 + # to not find them 3.682 + if test "x$new_path" = x \ 3.683 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.684 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.685 + new_path="$path" 3.686 + 3.687 + windows_path="$new_path" 3.688 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.689 + unix_path=`$CYGPATH -u "$windows_path"` 3.690 + new_path="$unix_path" 3.691 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.692 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.693 + new_path="$unix_path" 3.694 + fi 3.695 + 3.696 + fi 3.697 3.698 if test "x$new_path" = x; then 3.699 # It's still not found. Now this is an unrecoverable error. 3.700 @@ -28584,6 +28734,23 @@ 3.701 3.702 3.703 new_path=`$WHICH "$new_path" 2> /dev/null` 3.704 + # bat and cmd files are not always considered executable in MSYS causing which 3.705 + # to not find them 3.706 + if test "x$new_path" = x \ 3.707 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.708 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.709 + new_path="$path" 3.710 + 3.711 + windows_path="$new_path" 3.712 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.713 + unix_path=`$CYGPATH -u "$windows_path"` 3.714 + new_path="$unix_path" 3.715 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.716 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.717 + new_path="$unix_path" 3.718 + fi 3.719 + 3.720 + fi 3.721 3.722 if test "x$new_path" = x; then 3.723 # It's still not found. Now this is an unrecoverable error. 3.724 @@ -29457,6 +29624,23 @@ 3.725 3.726 3.727 new_path=`$WHICH "$new_path" 2> /dev/null` 3.728 + # bat and cmd files are not always considered executable in MSYS causing which 3.729 + # to not find them 3.730 + if test "x$new_path" = x \ 3.731 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.732 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.733 + new_path="$path" 3.734 + 3.735 + windows_path="$new_path" 3.736 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.737 + unix_path=`$CYGPATH -u "$windows_path"` 3.738 + new_path="$unix_path" 3.739 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.740 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.741 + new_path="$unix_path" 3.742 + fi 3.743 + 3.744 + fi 3.745 3.746 if test "x$new_path" = x; then 3.747 # It's still not found. Now this is an unrecoverable error. 3.748 @@ -29855,6 +30039,23 @@ 3.749 3.750 3.751 new_path=`$WHICH "$new_path" 2> /dev/null` 3.752 + # bat and cmd files are not always considered executable in MSYS causing which 3.753 + # to not find them 3.754 + if test "x$new_path" = x \ 3.755 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.756 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.757 + new_path="$path" 3.758 + 3.759 + windows_path="$new_path" 3.760 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.761 + unix_path=`$CYGPATH -u "$windows_path"` 3.762 + new_path="$unix_path" 3.763 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.764 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.765 + new_path="$unix_path" 3.766 + fi 3.767 + 3.768 + fi 3.769 3.770 if test "x$new_path" = x; then 3.771 # It's still not found. Now this is an unrecoverable error. 3.772 @@ -30182,6 +30383,23 @@ 3.773 3.774 3.775 new_path=`$WHICH "$new_path" 2> /dev/null` 3.776 + # bat and cmd files are not always considered executable in MSYS causing which 3.777 + # to not find them 3.778 + if test "x$new_path" = x \ 3.779 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.780 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.781 + new_path="$path" 3.782 + 3.783 + windows_path="$new_path" 3.784 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.785 + unix_path=`$CYGPATH -u "$windows_path"` 3.786 + new_path="$unix_path" 3.787 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.788 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.789 + new_path="$unix_path" 3.790 + fi 3.791 + 3.792 + fi 3.793 3.794 if test "x$new_path" = x; then 3.795 # It's still not found. Now this is an unrecoverable error. 3.796 @@ -30660,6 +30878,23 @@ 3.797 3.798 3.799 new_path=`$WHICH "$new_path" 2> /dev/null` 3.800 + # bat and cmd files are not always considered executable in MSYS causing which 3.801 + # to not find them 3.802 + if test "x$new_path" = x \ 3.803 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.804 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.805 + new_path="$path" 3.806 + 3.807 + windows_path="$new_path" 3.808 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.809 + unix_path=`$CYGPATH -u "$windows_path"` 3.810 + new_path="$unix_path" 3.811 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.812 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.813 + new_path="$unix_path" 3.814 + fi 3.815 + 3.816 + fi 3.817 3.818 if test "x$new_path" = x; then 3.819 # It's still not found. Now this is an unrecoverable error. 3.820 @@ -31271,6 +31506,23 @@ 3.821 3.822 3.823 new_path=`$WHICH "$new_path" 2> /dev/null` 3.824 + # bat and cmd files are not always considered executable in MSYS causing which 3.825 + # to not find them 3.826 + if test "x$new_path" = x \ 3.827 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.828 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.829 + new_path="$path" 3.830 + 3.831 + windows_path="$new_path" 3.832 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.833 + unix_path=`$CYGPATH -u "$windows_path"` 3.834 + new_path="$unix_path" 3.835 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.836 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.837 + new_path="$unix_path" 3.838 + fi 3.839 + 3.840 + fi 3.841 3.842 if test "x$new_path" = x; then 3.843 # It's still not found. Now this is an unrecoverable error. 3.844 @@ -31790,6 +32042,23 @@ 3.845 3.846 3.847 new_path=`$WHICH "$new_path" 2> /dev/null` 3.848 + # bat and cmd files are not always considered executable in MSYS causing which 3.849 + # to not find them 3.850 + if test "x$new_path" = x \ 3.851 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.852 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.853 + new_path="$path" 3.854 + 3.855 + windows_path="$new_path" 3.856 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.857 + unix_path=`$CYGPATH -u "$windows_path"` 3.858 + new_path="$unix_path" 3.859 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.860 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.861 + new_path="$unix_path" 3.862 + fi 3.863 + 3.864 + fi 3.865 3.866 if test "x$new_path" = x; then 3.867 # It's still not found. Now this is an unrecoverable error. 3.868 @@ -32241,6 +32510,23 @@ 3.869 3.870 3.871 new_path=`$WHICH "$new_path" 2> /dev/null` 3.872 + # bat and cmd files are not always considered executable in MSYS causing which 3.873 + # to not find them 3.874 + if test "x$new_path" = x \ 3.875 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.876 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.877 + new_path="$path" 3.878 + 3.879 + windows_path="$new_path" 3.880 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.881 + unix_path=`$CYGPATH -u "$windows_path"` 3.882 + new_path="$unix_path" 3.883 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.884 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.885 + new_path="$unix_path" 3.886 + fi 3.887 + 3.888 + fi 3.889 3.890 if test "x$new_path" = x; then 3.891 # It's still not found. Now this is an unrecoverable error. 3.892 @@ -32565,6 +32851,23 @@ 3.893 3.894 3.895 new_path=`$WHICH "$new_path" 2> /dev/null` 3.896 + # bat and cmd files are not always considered executable in MSYS causing which 3.897 + # to not find them 3.898 + if test "x$new_path" = x \ 3.899 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.900 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.901 + new_path="$path" 3.902 + 3.903 + windows_path="$new_path" 3.904 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.905 + unix_path=`$CYGPATH -u "$windows_path"` 3.906 + new_path="$unix_path" 3.907 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.908 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.909 + new_path="$unix_path" 3.910 + fi 3.911 + 3.912 + fi 3.913 3.914 if test "x$new_path" = x; then 3.915 # It's still not found. Now this is an unrecoverable error. 3.916 @@ -32885,6 +33188,23 @@ 3.917 3.918 3.919 new_path=`$WHICH "$new_path" 2> /dev/null` 3.920 + # bat and cmd files are not always considered executable in MSYS causing which 3.921 + # to not find them 3.922 + if test "x$new_path" = x \ 3.923 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.924 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.925 + new_path="$path" 3.926 + 3.927 + windows_path="$new_path" 3.928 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.929 + unix_path=`$CYGPATH -u "$windows_path"` 3.930 + new_path="$unix_path" 3.931 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.932 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.933 + new_path="$unix_path" 3.934 + fi 3.935 + 3.936 + fi 3.937 3.938 if test "x$new_path" = x; then 3.939 # It's still not found. Now this is an unrecoverable error. 3.940 @@ -33187,6 +33507,23 @@ 3.941 3.942 3.943 new_path=`$WHICH "$new_path" 2> /dev/null` 3.944 + # bat and cmd files are not always considered executable in MSYS causing which 3.945 + # to not find them 3.946 + if test "x$new_path" = x \ 3.947 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.948 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.949 + new_path="$path" 3.950 + 3.951 + windows_path="$new_path" 3.952 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.953 + unix_path=`$CYGPATH -u "$windows_path"` 3.954 + new_path="$unix_path" 3.955 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.956 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.957 + new_path="$unix_path" 3.958 + fi 3.959 + 3.960 + fi 3.961 3.962 if test "x$new_path" = x; then 3.963 # It's still not found. Now this is an unrecoverable error. 3.964 @@ -33641,6 +33978,23 @@ 3.965 3.966 3.967 new_path=`$WHICH "$new_path" 2> /dev/null` 3.968 + # bat and cmd files are not always considered executable in MSYS causing which 3.969 + # to not find them 3.970 + if test "x$new_path" = x \ 3.971 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.972 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.973 + new_path="$path" 3.974 + 3.975 + windows_path="$new_path" 3.976 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.977 + unix_path=`$CYGPATH -u "$windows_path"` 3.978 + new_path="$unix_path" 3.979 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.980 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.981 + new_path="$unix_path" 3.982 + fi 3.983 + 3.984 + fi 3.985 3.986 if test "x$new_path" = x; then 3.987 # It's still not found. Now this is an unrecoverable error. 3.988 @@ -34092,6 +34446,23 @@ 3.989 3.990 3.991 new_path=`$WHICH "$new_path" 2> /dev/null` 3.992 + # bat and cmd files are not always considered executable in MSYS causing which 3.993 + # to not find them 3.994 + if test "x$new_path" = x \ 3.995 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.996 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.997 + new_path="$path" 3.998 + 3.999 + windows_path="$new_path" 3.1000 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.1001 + unix_path=`$CYGPATH -u "$windows_path"` 3.1002 + new_path="$unix_path" 3.1003 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.1004 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.1005 + new_path="$unix_path" 3.1006 + fi 3.1007 + 3.1008 + fi 3.1009 3.1010 if test "x$new_path" = x; then 3.1011 # It's still not found. Now this is an unrecoverable error. 3.1012 @@ -34543,6 +34914,23 @@ 3.1013 3.1014 3.1015 new_path=`$WHICH "$new_path" 2> /dev/null` 3.1016 + # bat and cmd files are not always considered executable in MSYS causing which 3.1017 + # to not find them 3.1018 + if test "x$new_path" = x \ 3.1019 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.1020 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.1021 + new_path="$path" 3.1022 + 3.1023 + windows_path="$new_path" 3.1024 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.1025 + unix_path=`$CYGPATH -u "$windows_path"` 3.1026 + new_path="$unix_path" 3.1027 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.1028 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.1029 + new_path="$unix_path" 3.1030 + fi 3.1031 + 3.1032 + fi 3.1033 3.1034 if test "x$new_path" = x; then 3.1035 # It's still not found. Now this is an unrecoverable error. 3.1036 @@ -34995,6 +35383,23 @@ 3.1037 3.1038 3.1039 new_path=`$WHICH "$new_path" 2> /dev/null` 3.1040 + # bat and cmd files are not always considered executable in MSYS causing which 3.1041 + # to not find them 3.1042 + if test "x$new_path" = x \ 3.1043 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.1044 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.1045 + new_path="$path" 3.1046 + 3.1047 + windows_path="$new_path" 3.1048 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.1049 + unix_path=`$CYGPATH -u "$windows_path"` 3.1050 + new_path="$unix_path" 3.1051 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.1052 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.1053 + new_path="$unix_path" 3.1054 + fi 3.1055 + 3.1056 + fi 3.1057 3.1058 if test "x$new_path" = x; then 3.1059 # It's still not found. Now this is an unrecoverable error. 3.1060 @@ -35558,6 +35963,23 @@ 3.1061 3.1062 3.1063 new_path=`$WHICH "$new_path" 2> /dev/null` 3.1064 + # bat and cmd files are not always considered executable in MSYS causing which 3.1065 + # to not find them 3.1066 + if test "x$new_path" = x \ 3.1067 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.1068 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.1069 + new_path="$path" 3.1070 + 3.1071 + windows_path="$new_path" 3.1072 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.1073 + unix_path=`$CYGPATH -u "$windows_path"` 3.1074 + new_path="$unix_path" 3.1075 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.1076 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.1077 + new_path="$unix_path" 3.1078 + fi 3.1079 + 3.1080 + fi 3.1081 3.1082 if test "x$new_path" = x; then 3.1083 # It's still not found. Now this is an unrecoverable error. 3.1084 @@ -36162,6 +36584,23 @@ 3.1085 3.1086 3.1087 new_path=`$WHICH "$new_path" 2> /dev/null` 3.1088 + # bat and cmd files are not always considered executable in MSYS causing which 3.1089 + # to not find them 3.1090 + if test "x$new_path" = x \ 3.1091 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.1092 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.1093 + new_path="$path" 3.1094 + 3.1095 + windows_path="$new_path" 3.1096 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.1097 + unix_path=`$CYGPATH -u "$windows_path"` 3.1098 + new_path="$unix_path" 3.1099 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.1100 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.1101 + new_path="$unix_path" 3.1102 + fi 3.1103 + 3.1104 + fi 3.1105 3.1106 if test "x$new_path" = x; then 3.1107 # It's still not found. Now this is an unrecoverable error. 3.1108 @@ -36732,6 +37171,23 @@ 3.1109 3.1110 3.1111 new_path=`$WHICH "$new_path" 2> /dev/null` 3.1112 + # bat and cmd files are not always considered executable in MSYS causing which 3.1113 + # to not find them 3.1114 + if test "x$new_path" = x \ 3.1115 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.1116 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.1117 + new_path="$path" 3.1118 + 3.1119 + windows_path="$new_path" 3.1120 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.1121 + unix_path=`$CYGPATH -u "$windows_path"` 3.1122 + new_path="$unix_path" 3.1123 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.1124 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.1125 + new_path="$unix_path" 3.1126 + fi 3.1127 + 3.1128 + fi 3.1129 3.1130 if test "x$new_path" = x; then 3.1131 # It's still not found. Now this is an unrecoverable error. 3.1132 @@ -37299,6 +37755,23 @@ 3.1133 3.1134 3.1135 new_path=`$WHICH "$new_path" 2> /dev/null` 3.1136 + # bat and cmd files are not always considered executable in MSYS causing which 3.1137 + # to not find them 3.1138 + if test "x$new_path" = x \ 3.1139 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.1140 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.1141 + new_path="$path" 3.1142 + 3.1143 + windows_path="$new_path" 3.1144 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.1145 + unix_path=`$CYGPATH -u "$windows_path"` 3.1146 + new_path="$unix_path" 3.1147 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.1148 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.1149 + new_path="$unix_path" 3.1150 + fi 3.1151 + 3.1152 + fi 3.1153 3.1154 if test "x$new_path" = x; then 3.1155 # It's still not found. Now this is an unrecoverable error. 3.1156 @@ -37775,6 +38248,23 @@ 3.1157 3.1158 3.1159 new_path=`$WHICH "$new_path" 2> /dev/null` 3.1160 + # bat and cmd files are not always considered executable in MSYS causing which 3.1161 + # to not find them 3.1162 + if test "x$new_path" = x \ 3.1163 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.1164 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.1165 + new_path="$path" 3.1166 + 3.1167 + windows_path="$new_path" 3.1168 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.1169 + unix_path=`$CYGPATH -u "$windows_path"` 3.1170 + new_path="$unix_path" 3.1171 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.1172 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.1173 + new_path="$unix_path" 3.1174 + fi 3.1175 + 3.1176 + fi 3.1177 3.1178 if test "x$new_path" = x; then 3.1179 # It's still not found. Now this is an unrecoverable error. 3.1180 @@ -38226,6 +38716,23 @@ 3.1181 3.1182 3.1183 new_path=`$WHICH "$new_path" 2> /dev/null` 3.1184 + # bat and cmd files are not always considered executable in MSYS causing which 3.1185 + # to not find them 3.1186 + if test "x$new_path" = x \ 3.1187 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.1188 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.1189 + new_path="$path" 3.1190 + 3.1191 + windows_path="$new_path" 3.1192 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.1193 + unix_path=`$CYGPATH -u "$windows_path"` 3.1194 + new_path="$unix_path" 3.1195 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.1196 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.1197 + new_path="$unix_path" 3.1198 + fi 3.1199 + 3.1200 + fi 3.1201 3.1202 if test "x$new_path" = x; then 3.1203 # It's still not found. Now this is an unrecoverable error. 3.1204 @@ -38677,6 +39184,23 @@ 3.1205 3.1206 3.1207 new_path=`$WHICH "$new_path" 2> /dev/null` 3.1208 + # bat and cmd files are not always considered executable in MSYS causing which 3.1209 + # to not find them 3.1210 + if test "x$new_path" = x \ 3.1211 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 3.1212 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then 3.1213 + new_path="$path" 3.1214 + 3.1215 + windows_path="$new_path" 3.1216 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.1217 + unix_path=`$CYGPATH -u "$windows_path"` 3.1218 + new_path="$unix_path" 3.1219 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.1220 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.1221 + new_path="$unix_path" 3.1222 + fi 3.1223 + 3.1224 + fi 3.1225 3.1226 if test "x$new_path" = x; then 3.1227 # It's still not found. Now this is an unrecoverable error. 3.1228 @@ -46741,12 +47265,22 @@ 3.1229 { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5 3.1230 $as_echo_n "checking found msvcr100.dll architecture... " >&6; } 3.1231 MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"` 3.1232 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.1233 - CORRECT_MSVCR_ARCH=386 3.1234 - else 3.1235 - CORRECT_MSVCR_ARCH=x86-64 3.1236 - fi 3.1237 - if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then 3.1238 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.1239 + # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit" 3.1240 + # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems. 3.1241 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.1242 + CORRECT_MSVCR_ARCH="PE32 executable" 3.1243 + else 3.1244 + CORRECT_MSVCR_ARCH="PE32+ executable" 3.1245 + fi 3.1246 + else 3.1247 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.1248 + CORRECT_MSVCR_ARCH=386 3.1249 + else 3.1250 + CORRECT_MSVCR_ARCH=x86-64 3.1251 + fi 3.1252 + fi 3.1253 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then 3.1254 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 3.1255 $as_echo "ok" >&6; } 3.1256 MSVCR_DLL="$POSSIBLE_MSVCR_DLL" 3.1257 @@ -46797,12 +47331,22 @@ 3.1258 { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5 3.1259 $as_echo_n "checking found msvcr100.dll architecture... " >&6; } 3.1260 MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"` 3.1261 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.1262 - CORRECT_MSVCR_ARCH=386 3.1263 - else 3.1264 - CORRECT_MSVCR_ARCH=x86-64 3.1265 - fi 3.1266 - if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then 3.1267 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.1268 + # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit" 3.1269 + # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems. 3.1270 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.1271 + CORRECT_MSVCR_ARCH="PE32 executable" 3.1272 + else 3.1273 + CORRECT_MSVCR_ARCH="PE32+ executable" 3.1274 + fi 3.1275 + else 3.1276 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.1277 + CORRECT_MSVCR_ARCH=386 3.1278 + else 3.1279 + CORRECT_MSVCR_ARCH=x86-64 3.1280 + fi 3.1281 + fi 3.1282 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then 3.1283 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 3.1284 $as_echo "ok" >&6; } 3.1285 MSVCR_DLL="$POSSIBLE_MSVCR_DLL" 3.1286 @@ -46835,12 +47379,22 @@ 3.1287 { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5 3.1288 $as_echo_n "checking found msvcr100.dll architecture... " >&6; } 3.1289 MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"` 3.1290 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.1291 - CORRECT_MSVCR_ARCH=386 3.1292 - else 3.1293 - CORRECT_MSVCR_ARCH=x86-64 3.1294 - fi 3.1295 - if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then 3.1296 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.1297 + # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit" 3.1298 + # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems. 3.1299 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.1300 + CORRECT_MSVCR_ARCH="PE32 executable" 3.1301 + else 3.1302 + CORRECT_MSVCR_ARCH="PE32+ executable" 3.1303 + fi 3.1304 + else 3.1305 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.1306 + CORRECT_MSVCR_ARCH=386 3.1307 + else 3.1308 + CORRECT_MSVCR_ARCH=x86-64 3.1309 + fi 3.1310 + fi 3.1311 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then 3.1312 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 3.1313 $as_echo "ok" >&6; } 3.1314 MSVCR_DLL="$POSSIBLE_MSVCR_DLL" 3.1315 @@ -46883,12 +47437,22 @@ 3.1316 { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5 3.1317 $as_echo_n "checking found msvcr100.dll architecture... " >&6; } 3.1318 MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"` 3.1319 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.1320 - CORRECT_MSVCR_ARCH=386 3.1321 - else 3.1322 - CORRECT_MSVCR_ARCH=x86-64 3.1323 - fi 3.1324 - if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then 3.1325 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.1326 + # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit" 3.1327 + # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems. 3.1328 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.1329 + CORRECT_MSVCR_ARCH="PE32 executable" 3.1330 + else 3.1331 + CORRECT_MSVCR_ARCH="PE32+ executable" 3.1332 + fi 3.1333 + else 3.1334 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.1335 + CORRECT_MSVCR_ARCH=386 3.1336 + else 3.1337 + CORRECT_MSVCR_ARCH=x86-64 3.1338 + fi 3.1339 + fi 3.1340 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then 3.1341 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 3.1342 $as_echo "ok" >&6; } 3.1343 MSVCR_DLL="$POSSIBLE_MSVCR_DLL" 3.1344 @@ -46936,12 +47500,22 @@ 3.1345 { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5 3.1346 $as_echo_n "checking found msvcr100.dll architecture... " >&6; } 3.1347 MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"` 3.1348 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.1349 - CORRECT_MSVCR_ARCH=386 3.1350 - else 3.1351 - CORRECT_MSVCR_ARCH=x86-64 3.1352 - fi 3.1353 - if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then 3.1354 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.1355 + # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit" 3.1356 + # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems. 3.1357 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.1358 + CORRECT_MSVCR_ARCH="PE32 executable" 3.1359 + else 3.1360 + CORRECT_MSVCR_ARCH="PE32+ executable" 3.1361 + fi 3.1362 + else 3.1363 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.1364 + CORRECT_MSVCR_ARCH=386 3.1365 + else 3.1366 + CORRECT_MSVCR_ARCH=x86-64 3.1367 + fi 3.1368 + fi 3.1369 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then 3.1370 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 3.1371 $as_echo "ok" >&6; } 3.1372 MSVCR_DLL="$POSSIBLE_MSVCR_DLL" 3.1373 @@ -46985,12 +47559,22 @@ 3.1374 { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5 3.1375 $as_echo_n "checking found msvcr100.dll architecture... " >&6; } 3.1376 MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"` 3.1377 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.1378 - CORRECT_MSVCR_ARCH=386 3.1379 - else 3.1380 - CORRECT_MSVCR_ARCH=x86-64 3.1381 - fi 3.1382 - if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then 3.1383 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.1384 + # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit" 3.1385 + # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems. 3.1386 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.1387 + CORRECT_MSVCR_ARCH="PE32 executable" 3.1388 + else 3.1389 + CORRECT_MSVCR_ARCH="PE32+ executable" 3.1390 + fi 3.1391 + else 3.1392 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 3.1393 + CORRECT_MSVCR_ARCH=386 3.1394 + else 3.1395 + CORRECT_MSVCR_ARCH=x86-64 3.1396 + fi 3.1397 + fi 3.1398 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then 3.1399 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 3.1400 $as_echo "ok" >&6; } 3.1401 MSVCR_DLL="$POSSIBLE_MSVCR_DLL" 3.1402 @@ -47933,7 +48517,7 @@ 3.1403 3.1404 # Check for some common pitfalls 3.1405 3.1406 - if test x"$OPENJDK_BUILD_OS" = xwindows; then 3.1407 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.1408 file_to_test="$SRC_ROOT/LICENSE" 3.1409 if test `$STAT -c '%a' "$file_to_test"` -lt 400; then 3.1410 as_fn_error $? "Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin." "$LINENO" 5
4.1 --- a/common/autoconf/platform.m4 Wed Apr 18 12:37:18 2018 -0700 4.2 +++ b/common/autoconf/platform.m4 Tue Apr 17 09:33:36 2018 -0700 4.3 @@ -179,6 +179,7 @@ 4.4 OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN" 4.5 AC_SUBST(OPENJDK_BUILD_OS) 4.6 AC_SUBST(OPENJDK_BUILD_OS_API) 4.7 + AC_SUBST(OPENJDK_BUILD_OS_ENV) 4.8 AC_SUBST(OPENJDK_BUILD_CPU) 4.9 AC_SUBST(OPENJDK_BUILD_CPU_ARCH) 4.10 AC_SUBST(OPENJDK_BUILD_CPU_BITS) 4.11 @@ -200,6 +201,7 @@ 4.12 OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN" 4.13 AC_SUBST(OPENJDK_TARGET_OS) 4.14 AC_SUBST(OPENJDK_TARGET_OS_API) 4.15 + AC_SUBST(OPENJDK_TARGET_OS_ENV) 4.16 AC_SUBST(OPENJDK_TARGET_CPU) 4.17 AC_SUBST(OPENJDK_TARGET_CPU_ARCH) 4.18 AC_SUBST(OPENJDK_TARGET_CPU_BITS)
5.1 --- a/common/autoconf/spec.gmk.in Wed Apr 18 12:37:18 2018 -0700 5.2 +++ b/common/autoconf/spec.gmk.in Tue Apr 17 09:33:36 2018 -0700 5.3 @@ -101,6 +101,7 @@ 5.4 # When not cross-compiling, it is the same as the target. 5.5 OPENJDK_BUILD_OS:=@OPENJDK_BUILD_OS@ 5.6 OPENJDK_BUILD_OS_API:=@OPENJDK_BUILD_OS_API@ 5.7 +OPENJDK_BUILD_OS_ENV:=@OPENJDK_BUILD_OS_ENV@ 5.8 5.9 OPENJDK_BUILD_CPU:=@OPENJDK_BUILD_CPU@ 5.10 OPENJDK_BUILD_CPU_ARCH:=@OPENJDK_BUILD_CPU_ARCH@
6.1 --- a/common/autoconf/toolchain_windows.m4 Wed Apr 18 12:37:18 2018 -0700 6.2 +++ b/common/autoconf/toolchain_windows.m4 Tue Apr 17 09:33:36 2018 -0700 6.3 @@ -244,12 +244,22 @@ 6.4 # Need to check if the found msvcr is correct architecture 6.5 AC_MSG_CHECKING([found msvcr100.dll architecture]) 6.6 MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"` 6.7 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 6.8 - CORRECT_MSVCR_ARCH=386 6.9 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 6.10 + # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit" 6.11 + # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems. 6.12 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 6.13 + CORRECT_MSVCR_ARCH="PE32 executable" 6.14 + else 6.15 + CORRECT_MSVCR_ARCH="PE32+ executable" 6.16 + fi 6.17 else 6.18 - CORRECT_MSVCR_ARCH=x86-64 6.19 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 6.20 + CORRECT_MSVCR_ARCH=386 6.21 + else 6.22 + CORRECT_MSVCR_ARCH=x86-64 6.23 + fi 6.24 fi 6.25 - if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then 6.26 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then 6.27 AC_MSG_RESULT([ok]) 6.28 MSVCR_DLL="$POSSIBLE_MSVCR_DLL" 6.29 AC_MSG_CHECKING([for msvcr100.dll])
7.1 --- a/make/common/NativeCompilation.gmk Wed Apr 18 12:37:18 2018 -0700 7.2 +++ b/make/common/NativeCompilation.gmk Tue Apr 17 09:33:36 2018 -0700 7.3 @@ -43,6 +43,12 @@ 7.4 ARCHIVING_MSG= 7.5 endif 7.6 7.7 +ifeq ($(OPENJDK_BUILD_OS_ENV), windows.cygwin) 7.8 + UNIX_PATH_PREFIX := /cygdrive 7.9 +else ifeq ($(OPENJDK_BUILD_OS_ENV), windows.msys) 7.10 + UNIX_PATH_PREFIX := 7.11 +endif 7.12 + 7.13 define add_native_source 7.14 # param 1 = BUILD_MYPACKAGE 7.15 # parma 2 = the source file name (..../alfa.c or .../beta.cpp) 7.16 @@ -117,7 +123,7 @@ 7.17 && $(SED) -e '/^Note: including file:/!d' \ 7.18 -e 's|Note: including file: *||' \ 7.19 -e 's|\\|/|g' \ 7.20 - -e 's|^\([a-zA-Z]\):|/cygdrive/\1|g' \ 7.21 + -e 's|^\([a-zA-Z]\):|$(UNIX_PATH_PREFIX)/\1|g' \ 7.22 -e '/$(subst /,\/,$(TOPDIR))/!d' \ 7.23 -e 's|$$$$| \\|g' \ 7.24 $$($1_$2_DEP).raw) > $$($1_$2_DEP)
