1.1 --- a/common/autoconf/generated-configure.sh Wed Apr 18 12:37:18 2018 -0700
1.2 +++ b/common/autoconf/generated-configure.sh Tue Apr 17 09:33:36 2018 -0700
1.3 @@ -907,12 +907,14 @@
1.4 OPENJDK_TARGET_CPU_BITS
1.5 OPENJDK_TARGET_CPU_ARCH
1.6 OPENJDK_TARGET_CPU
1.7 +OPENJDK_TARGET_OS_ENV
1.8 OPENJDK_TARGET_OS_API
1.9 OPENJDK_TARGET_OS
1.10 OPENJDK_BUILD_CPU_ENDIAN
1.11 OPENJDK_BUILD_CPU_BITS
1.12 OPENJDK_BUILD_CPU_ARCH
1.13 OPENJDK_BUILD_CPU
1.14 +OPENJDK_BUILD_OS_ENV
1.15 OPENJDK_BUILD_OS_API
1.16 OPENJDK_BUILD_OS
1.17 OPENJDK_BUILD_AUTOCONF_NAME
1.18 @@ -929,6 +931,7 @@
1.19 build_vendor
1.20 build_cpu
1.21 build
1.22 +CPIO
1.23 SETFILE
1.24 DF
1.25 READLINK
1.26 @@ -967,7 +970,6 @@
1.27 DIFF
1.28 DATE
1.29 CUT
1.30 -CPIO
1.31 CP
1.32 COMM
1.33 CMP
1.34 @@ -1105,7 +1107,6 @@
1.35 CMP
1.36 COMM
1.37 CP
1.38 -CPIO
1.39 CUT
1.40 DATE
1.41 DIFF
1.42 @@ -1144,6 +1145,7 @@
1.43 READLINK
1.44 DF
1.45 SETFILE
1.46 +CPIO
1.47 UNZIP
1.48 ZIP
1.49 LDD
1.50 @@ -1957,7 +1959,6 @@
1.51 CMP Override default value for CMP
1.52 COMM Override default value for COMM
1.53 CP Override default value for CP
1.54 - CPIO Override default value for CPIO
1.55 CUT Override default value for CUT
1.56 DATE Override default value for DATE
1.57 DIFF Override default value for DIFF
1.58 @@ -1996,6 +1997,7 @@
1.59 READLINK Override default value for READLINK
1.60 DF Override default value for DF
1.61 SETFILE Override default value for SETFILE
1.62 + CPIO Override default value for CPIO
1.63 UNZIP Override default value for UNZIP
1.64 ZIP Override default value for ZIP
1.65 LDD Override default value for LDD
1.66 @@ -4235,7 +4237,7 @@
1.67 #CUSTOM_AUTOCONF_INCLUDE
1.68
1.69 # Do not change or remove the following line, it is needed for consistency checks:
1.70 -DATE_WHEN_GENERATED=1523864865
1.71 +DATE_WHEN_GENERATED=1523982801
1.72
1.73 ###############################################################################
1.74 #
1.75 @@ -5640,199 +5642,6 @@
1.76 # Publish this variable in the help.
1.77
1.78
1.79 - if test "x$CPIO" = x; then
1.80 - # The variable is not set by user, try to locate tool using the code snippet
1.81 - for ac_prog in cpio
1.82 -do
1.83 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.84 -set dummy $ac_prog; ac_word=$2
1.85 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.86 -$as_echo_n "checking for $ac_word... " >&6; }
1.87 -if ${ac_cv_path_CPIO+:} false; then :
1.88 - $as_echo_n "(cached) " >&6
1.89 -else
1.90 - case $CPIO in
1.91 - [\\/]* | ?:[\\/]*)
1.92 - ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
1.93 - ;;
1.94 - *)
1.95 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.96 -for as_dir in $PATH
1.97 -do
1.98 - IFS=$as_save_IFS
1.99 - test -z "$as_dir" && as_dir=.
1.100 - for ac_exec_ext in '' $ac_executable_extensions; do
1.101 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.102 - ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
1.103 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.104 - break 2
1.105 - fi
1.106 -done
1.107 - done
1.108 -IFS=$as_save_IFS
1.109 -
1.110 - ;;
1.111 -esac
1.112 -fi
1.113 -CPIO=$ac_cv_path_CPIO
1.114 -if test -n "$CPIO"; then
1.115 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
1.116 -$as_echo "$CPIO" >&6; }
1.117 -else
1.118 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.119 -$as_echo "no" >&6; }
1.120 -fi
1.121 -
1.122 -
1.123 - test -n "$CPIO" && break
1.124 -done
1.125 -
1.126 - else
1.127 - # The variable is set, but is it from the command line or the environment?
1.128 -
1.129 - # Try to remove the string !CPIO! from our list.
1.130 - try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CPIO!/}
1.131 - if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.132 - # If it failed, the variable was not from the command line. Ignore it,
1.133 - # but warn the user (except for BASH, which is always set by the calling BASH).
1.134 - if test "xCPIO" != xBASH; then
1.135 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CPIO from the environment. Use command line variables instead." >&5
1.136 -$as_echo "$as_me: WARNING: Ignoring value of CPIO from the environment. Use command line variables instead." >&2;}
1.137 - fi
1.138 - # Try to locate tool using the code snippet
1.139 - for ac_prog in cpio
1.140 -do
1.141 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.142 -set dummy $ac_prog; ac_word=$2
1.143 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.144 -$as_echo_n "checking for $ac_word... " >&6; }
1.145 -if ${ac_cv_path_CPIO+:} false; then :
1.146 - $as_echo_n "(cached) " >&6
1.147 -else
1.148 - case $CPIO in
1.149 - [\\/]* | ?:[\\/]*)
1.150 - ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
1.151 - ;;
1.152 - *)
1.153 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.154 -for as_dir in $PATH
1.155 -do
1.156 - IFS=$as_save_IFS
1.157 - test -z "$as_dir" && as_dir=.
1.158 - for ac_exec_ext in '' $ac_executable_extensions; do
1.159 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.160 - ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
1.161 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.162 - break 2
1.163 - fi
1.164 -done
1.165 - done
1.166 -IFS=$as_save_IFS
1.167 -
1.168 - ;;
1.169 -esac
1.170 -fi
1.171 -CPIO=$ac_cv_path_CPIO
1.172 -if test -n "$CPIO"; then
1.173 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
1.174 -$as_echo "$CPIO" >&6; }
1.175 -else
1.176 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.177 -$as_echo "no" >&6; }
1.178 -fi
1.179 -
1.180 -
1.181 - test -n "$CPIO" && break
1.182 -done
1.183 -
1.184 - else
1.185 - # If it succeeded, then it was overridden by the user. We will use it
1.186 - # for the tool.
1.187 -
1.188 - # First remove it from the list of overridden variables, so we can test
1.189 - # for unknown variables in the end.
1.190 - CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.191 -
1.192 - # Check if the provided tool contains a complete path.
1.193 - tool_specified="$CPIO"
1.194 - tool_basename="${tool_specified##*/}"
1.195 - if test "x$tool_basename" = "x$tool_specified"; then
1.196 - # A command without a complete path is provided, search $PATH.
1.197 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CPIO=$tool_basename" >&5
1.198 -$as_echo "$as_me: Will search for user supplied tool CPIO=$tool_basename" >&6;}
1.199 - # Extract the first word of "$tool_basename", so it can be a program name with args.
1.200 -set dummy $tool_basename; ac_word=$2
1.201 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.202 -$as_echo_n "checking for $ac_word... " >&6; }
1.203 -if ${ac_cv_path_CPIO+:} false; then :
1.204 - $as_echo_n "(cached) " >&6
1.205 -else
1.206 - case $CPIO in
1.207 - [\\/]* | ?:[\\/]*)
1.208 - ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
1.209 - ;;
1.210 - *)
1.211 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.212 -for as_dir in $PATH
1.213 -do
1.214 - IFS=$as_save_IFS
1.215 - test -z "$as_dir" && as_dir=.
1.216 - for ac_exec_ext in '' $ac_executable_extensions; do
1.217 - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.218 - ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
1.219 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.220 - break 2
1.221 - fi
1.222 -done
1.223 - done
1.224 -IFS=$as_save_IFS
1.225 -
1.226 - ;;
1.227 -esac
1.228 -fi
1.229 -CPIO=$ac_cv_path_CPIO
1.230 -if test -n "$CPIO"; then
1.231 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
1.232 -$as_echo "$CPIO" >&6; }
1.233 -else
1.234 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.235 -$as_echo "no" >&6; }
1.236 -fi
1.237 -
1.238 -
1.239 - if test "x$CPIO" = x; then
1.240 - as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.241 - fi
1.242 - else
1.243 - # Otherwise we believe it is a complete path. Use it as it is.
1.244 - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CPIO=$tool_specified" >&5
1.245 -$as_echo "$as_me: Will use user supplied tool CPIO=$tool_specified" >&6;}
1.246 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPIO" >&5
1.247 -$as_echo_n "checking for CPIO... " >&6; }
1.248 - if test ! -x "$tool_specified"; then
1.249 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.250 -$as_echo "not found" >&6; }
1.251 - as_fn_error $? "User supplied tool CPIO=$tool_specified does not exist or is not executable" "$LINENO" 5
1.252 - fi
1.253 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.254 -$as_echo "$tool_specified" >&6; }
1.255 - fi
1.256 - fi
1.257 - fi
1.258 -
1.259 -
1.260 -
1.261 - if test "x$CPIO" = x; then
1.262 - as_fn_error $? "Could not find required tool for CPIO" "$LINENO" 5
1.263 - fi
1.264 -
1.265 -
1.266 -
1.267 -
1.268 -
1.269 - # Publish this variable in the help.
1.270 -
1.271 -
1.272 if test "x$CUT" = x; then
1.273 # The variable is not set by user, try to locate tool using the code snippet
1.274 for ac_prog in cut
1.275 @@ -13302,6 +13111,192 @@
1.276
1.277
1.278
1.279 + # Publish this variable in the help.
1.280 +
1.281 +
1.282 + if test "x$CPIO" = x; then
1.283 + # The variable is not set by user, try to locate tool using the code snippet
1.284 + for ac_prog in cpio bsdcpio
1.285 +do
1.286 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.287 +set dummy $ac_prog; ac_word=$2
1.288 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.289 +$as_echo_n "checking for $ac_word... " >&6; }
1.290 +if ${ac_cv_path_CPIO+:} false; then :
1.291 + $as_echo_n "(cached) " >&6
1.292 +else
1.293 + case $CPIO in
1.294 + [\\/]* | ?:[\\/]*)
1.295 + ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
1.296 + ;;
1.297 + *)
1.298 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.299 +for as_dir in $PATH
1.300 +do
1.301 + IFS=$as_save_IFS
1.302 + test -z "$as_dir" && as_dir=.
1.303 + for ac_exec_ext in '' $ac_executable_extensions; do
1.304 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.305 + ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
1.306 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.307 + break 2
1.308 + fi
1.309 +done
1.310 + done
1.311 +IFS=$as_save_IFS
1.312 +
1.313 + ;;
1.314 +esac
1.315 +fi
1.316 +CPIO=$ac_cv_path_CPIO
1.317 +if test -n "$CPIO"; then
1.318 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
1.319 +$as_echo "$CPIO" >&6; }
1.320 +else
1.321 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.322 +$as_echo "no" >&6; }
1.323 +fi
1.324 +
1.325 +
1.326 + test -n "$CPIO" && break
1.327 +done
1.328 +
1.329 + else
1.330 + # The variable is set, but is it from the command line or the environment?
1.331 +
1.332 + # Try to remove the string !CPIO! from our list.
1.333 + try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CPIO!/}
1.334 + if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
1.335 + # If it failed, the variable was not from the command line. Ignore it,
1.336 + # but warn the user (except for BASH, which is always set by the calling BASH).
1.337 + if test "xCPIO" != xBASH; then
1.338 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CPIO from the environment. Use command line variables instead." >&5
1.339 +$as_echo "$as_me: WARNING: Ignoring value of CPIO from the environment. Use command line variables instead." >&2;}
1.340 + fi
1.341 + # Try to locate tool using the code snippet
1.342 + for ac_prog in cpio bsdcpio
1.343 +do
1.344 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.345 +set dummy $ac_prog; ac_word=$2
1.346 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.347 +$as_echo_n "checking for $ac_word... " >&6; }
1.348 +if ${ac_cv_path_CPIO+:} false; then :
1.349 + $as_echo_n "(cached) " >&6
1.350 +else
1.351 + case $CPIO in
1.352 + [\\/]* | ?:[\\/]*)
1.353 + ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
1.354 + ;;
1.355 + *)
1.356 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.357 +for as_dir in $PATH
1.358 +do
1.359 + IFS=$as_save_IFS
1.360 + test -z "$as_dir" && as_dir=.
1.361 + for ac_exec_ext in '' $ac_executable_extensions; do
1.362 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.363 + ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
1.364 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.365 + break 2
1.366 + fi
1.367 +done
1.368 + done
1.369 +IFS=$as_save_IFS
1.370 +
1.371 + ;;
1.372 +esac
1.373 +fi
1.374 +CPIO=$ac_cv_path_CPIO
1.375 +if test -n "$CPIO"; then
1.376 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
1.377 +$as_echo "$CPIO" >&6; }
1.378 +else
1.379 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.380 +$as_echo "no" >&6; }
1.381 +fi
1.382 +
1.383 +
1.384 + test -n "$CPIO" && break
1.385 +done
1.386 +
1.387 + else
1.388 + # If it succeeded, then it was overridden by the user. We will use it
1.389 + # for the tool.
1.390 +
1.391 + # First remove it from the list of overridden variables, so we can test
1.392 + # for unknown variables in the end.
1.393 + CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
1.394 +
1.395 + # Check if the provided tool contains a complete path.
1.396 + tool_specified="$CPIO"
1.397 + tool_basename="${tool_specified##*/}"
1.398 + if test "x$tool_basename" = "x$tool_specified"; then
1.399 + # A command without a complete path is provided, search $PATH.
1.400 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CPIO=$tool_basename" >&5
1.401 +$as_echo "$as_me: Will search for user supplied tool CPIO=$tool_basename" >&6;}
1.402 + # Extract the first word of "$tool_basename", so it can be a program name with args.
1.403 +set dummy $tool_basename; ac_word=$2
1.404 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.405 +$as_echo_n "checking for $ac_word... " >&6; }
1.406 +if ${ac_cv_path_CPIO+:} false; then :
1.407 + $as_echo_n "(cached) " >&6
1.408 +else
1.409 + case $CPIO in
1.410 + [\\/]* | ?:[\\/]*)
1.411 + ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
1.412 + ;;
1.413 + *)
1.414 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.415 +for as_dir in $PATH
1.416 +do
1.417 + IFS=$as_save_IFS
1.418 + test -z "$as_dir" && as_dir=.
1.419 + for ac_exec_ext in '' $ac_executable_extensions; do
1.420 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.421 + ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
1.422 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.423 + break 2
1.424 + fi
1.425 +done
1.426 + done
1.427 +IFS=$as_save_IFS
1.428 +
1.429 + ;;
1.430 +esac
1.431 +fi
1.432 +CPIO=$ac_cv_path_CPIO
1.433 +if test -n "$CPIO"; then
1.434 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
1.435 +$as_echo "$CPIO" >&6; }
1.436 +else
1.437 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.438 +$as_echo "no" >&6; }
1.439 +fi
1.440 +
1.441 +
1.442 + if test "x$CPIO" = x; then
1.443 + as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
1.444 + fi
1.445 + else
1.446 + # Otherwise we believe it is a complete path. Use it as it is.
1.447 + { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CPIO=$tool_specified" >&5
1.448 +$as_echo "$as_me: Will use user supplied tool CPIO=$tool_specified" >&6;}
1.449 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPIO" >&5
1.450 +$as_echo_n "checking for CPIO... " >&6; }
1.451 + if test ! -x "$tool_specified"; then
1.452 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
1.453 +$as_echo "not found" >&6; }
1.454 + as_fn_error $? "User supplied tool CPIO=$tool_specified does not exist or is not executable" "$LINENO" 5
1.455 + fi
1.456 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
1.457 +$as_echo "$tool_specified" >&6; }
1.458 + fi
1.459 + fi
1.460 + fi
1.461 +
1.462 +
1.463 +
1.464 +
1.465 # Now we can determine OpenJDK build and target platforms. This is required to
1.466 # have early on.
1.467 # Make sure we can run config.sub.
1.468 @@ -13566,6 +13561,7 @@
1.469
1.470
1.471
1.472 +
1.473 { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-build os-cpu" >&5
1.474 $as_echo_n "checking openjdk-build os-cpu... " >&6; }
1.475 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&5
1.476 @@ -13703,6 +13699,7 @@
1.477
1.478
1.479
1.480 +
1.481 { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-target os-cpu" >&5
1.482 $as_echo_n "checking openjdk-target os-cpu... " >&6; }
1.483 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&5
1.484 @@ -15400,6 +15397,23 @@
1.485
1.486
1.487 new_path=`$WHICH "$new_path" 2> /dev/null`
1.488 + # bat and cmd files are not always considered executable in MSYS causing which
1.489 + # to not find them
1.490 + if test "x$new_path" = x \
1.491 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.492 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.493 + new_path="$path"
1.494 +
1.495 + windows_path="$new_path"
1.496 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.497 + unix_path=`$CYGPATH -u "$windows_path"`
1.498 + new_path="$unix_path"
1.499 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.500 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.501 + new_path="$unix_path"
1.502 + fi
1.503 +
1.504 + fi
1.505
1.506 if test "x$new_path" = x; then
1.507 # It's still not found. Now this is an unrecoverable error.
1.508 @@ -15756,6 +15770,23 @@
1.509
1.510
1.511 new_path=`$WHICH "$new_path" 2> /dev/null`
1.512 + # bat and cmd files are not always considered executable in MSYS causing which
1.513 + # to not find them
1.514 + if test "x$new_path" = x \
1.515 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.516 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.517 + new_path="$path"
1.518 +
1.519 + windows_path="$new_path"
1.520 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.521 + unix_path=`$CYGPATH -u "$windows_path"`
1.522 + new_path="$unix_path"
1.523 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.524 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.525 + new_path="$unix_path"
1.526 + fi
1.527 +
1.528 + fi
1.529
1.530 if test "x$new_path" = x; then
1.531 # It's still not found. Now this is an unrecoverable error.
1.532 @@ -16109,6 +16140,23 @@
1.533
1.534
1.535 new_path=`$WHICH "$new_path" 2> /dev/null`
1.536 + # bat and cmd files are not always considered executable in MSYS causing which
1.537 + # to not find them
1.538 + if test "x$new_path" = x \
1.539 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.540 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.541 + new_path="$path"
1.542 +
1.543 + windows_path="$new_path"
1.544 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.545 + unix_path=`$CYGPATH -u "$windows_path"`
1.546 + new_path="$unix_path"
1.547 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.548 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.549 + new_path="$unix_path"
1.550 + fi
1.551 +
1.552 + fi
1.553
1.554 if test "x$new_path" = x; then
1.555 # It's still not found. Now this is an unrecoverable error.
1.556 @@ -16467,6 +16515,23 @@
1.557
1.558
1.559 new_path=`$WHICH "$new_path" 2> /dev/null`
1.560 + # bat and cmd files are not always considered executable in MSYS causing which
1.561 + # to not find them
1.562 + if test "x$new_path" = x \
1.563 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.564 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.565 + new_path="$path"
1.566 +
1.567 + windows_path="$new_path"
1.568 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.569 + unix_path=`$CYGPATH -u "$windows_path"`
1.570 + new_path="$unix_path"
1.571 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.572 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.573 + new_path="$unix_path"
1.574 + fi
1.575 +
1.576 + fi
1.577
1.578 if test "x$new_path" = x; then
1.579 # It's still not found. Now this is an unrecoverable error.
1.580 @@ -16819,6 +16884,23 @@
1.581
1.582
1.583 new_path=`$WHICH "$new_path" 2> /dev/null`
1.584 + # bat and cmd files are not always considered executable in MSYS causing which
1.585 + # to not find them
1.586 + if test "x$new_path" = x \
1.587 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.588 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.589 + new_path="$path"
1.590 +
1.591 + windows_path="$new_path"
1.592 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.593 + unix_path=`$CYGPATH -u "$windows_path"`
1.594 + new_path="$unix_path"
1.595 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.596 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.597 + new_path="$unix_path"
1.598 + fi
1.599 +
1.600 + fi
1.601
1.602 if test "x$new_path" = x; then
1.603 # It's still not found. Now this is an unrecoverable error.
1.604 @@ -25666,6 +25748,23 @@
1.605
1.606
1.607 new_path=`$WHICH "$new_path" 2> /dev/null`
1.608 + # bat and cmd files are not always considered executable in MSYS causing which
1.609 + # to not find them
1.610 + if test "x$new_path" = x \
1.611 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.612 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.613 + new_path="$path"
1.614 +
1.615 + windows_path="$new_path"
1.616 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.617 + unix_path=`$CYGPATH -u "$windows_path"`
1.618 + new_path="$unix_path"
1.619 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.620 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.621 + new_path="$unix_path"
1.622 + fi
1.623 +
1.624 + fi
1.625
1.626 if test "x$new_path" = x; then
1.627 # It's still not found. Now this is an unrecoverable error.
1.628 @@ -26436,6 +26535,23 @@
1.629
1.630
1.631 new_path=`$WHICH "$new_path" 2> /dev/null`
1.632 + # bat and cmd files are not always considered executable in MSYS causing which
1.633 + # to not find them
1.634 + if test "x$new_path" = x \
1.635 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.636 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.637 + new_path="$path"
1.638 +
1.639 + windows_path="$new_path"
1.640 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.641 + unix_path=`$CYGPATH -u "$windows_path"`
1.642 + new_path="$unix_path"
1.643 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.644 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.645 + new_path="$unix_path"
1.646 + fi
1.647 +
1.648 + fi
1.649
1.650 if test "x$new_path" = x; then
1.651 # It's still not found. Now this is an unrecoverable error.
1.652 @@ -26876,6 +26992,23 @@
1.653
1.654
1.655 new_path=`$WHICH "$new_path" 2> /dev/null`
1.656 + # bat and cmd files are not always considered executable in MSYS causing which
1.657 + # to not find them
1.658 + if test "x$new_path" = x \
1.659 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.660 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.661 + new_path="$path"
1.662 +
1.663 + windows_path="$new_path"
1.664 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.665 + unix_path=`$CYGPATH -u "$windows_path"`
1.666 + new_path="$unix_path"
1.667 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.668 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.669 + new_path="$unix_path"
1.670 + fi
1.671 +
1.672 + fi
1.673
1.674 if test "x$new_path" = x; then
1.675 # It's still not found. Now this is an unrecoverable error.
1.676 @@ -28144,6 +28277,23 @@
1.677
1.678
1.679 new_path=`$WHICH "$new_path" 2> /dev/null`
1.680 + # bat and cmd files are not always considered executable in MSYS causing which
1.681 + # to not find them
1.682 + if test "x$new_path" = x \
1.683 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.684 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.685 + new_path="$path"
1.686 +
1.687 + windows_path="$new_path"
1.688 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.689 + unix_path=`$CYGPATH -u "$windows_path"`
1.690 + new_path="$unix_path"
1.691 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.692 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.693 + new_path="$unix_path"
1.694 + fi
1.695 +
1.696 + fi
1.697
1.698 if test "x$new_path" = x; then
1.699 # It's still not found. Now this is an unrecoverable error.
1.700 @@ -28584,6 +28734,23 @@
1.701
1.702
1.703 new_path=`$WHICH "$new_path" 2> /dev/null`
1.704 + # bat and cmd files are not always considered executable in MSYS causing which
1.705 + # to not find them
1.706 + if test "x$new_path" = x \
1.707 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.708 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.709 + new_path="$path"
1.710 +
1.711 + windows_path="$new_path"
1.712 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.713 + unix_path=`$CYGPATH -u "$windows_path"`
1.714 + new_path="$unix_path"
1.715 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.716 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.717 + new_path="$unix_path"
1.718 + fi
1.719 +
1.720 + fi
1.721
1.722 if test "x$new_path" = x; then
1.723 # It's still not found. Now this is an unrecoverable error.
1.724 @@ -29457,6 +29624,23 @@
1.725
1.726
1.727 new_path=`$WHICH "$new_path" 2> /dev/null`
1.728 + # bat and cmd files are not always considered executable in MSYS causing which
1.729 + # to not find them
1.730 + if test "x$new_path" = x \
1.731 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.732 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.733 + new_path="$path"
1.734 +
1.735 + windows_path="$new_path"
1.736 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.737 + unix_path=`$CYGPATH -u "$windows_path"`
1.738 + new_path="$unix_path"
1.739 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.740 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.741 + new_path="$unix_path"
1.742 + fi
1.743 +
1.744 + fi
1.745
1.746 if test "x$new_path" = x; then
1.747 # It's still not found. Now this is an unrecoverable error.
1.748 @@ -29855,6 +30039,23 @@
1.749
1.750
1.751 new_path=`$WHICH "$new_path" 2> /dev/null`
1.752 + # bat and cmd files are not always considered executable in MSYS causing which
1.753 + # to not find them
1.754 + if test "x$new_path" = x \
1.755 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.756 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.757 + new_path="$path"
1.758 +
1.759 + windows_path="$new_path"
1.760 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.761 + unix_path=`$CYGPATH -u "$windows_path"`
1.762 + new_path="$unix_path"
1.763 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.764 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.765 + new_path="$unix_path"
1.766 + fi
1.767 +
1.768 + fi
1.769
1.770 if test "x$new_path" = x; then
1.771 # It's still not found. Now this is an unrecoverable error.
1.772 @@ -30182,6 +30383,23 @@
1.773
1.774
1.775 new_path=`$WHICH "$new_path" 2> /dev/null`
1.776 + # bat and cmd files are not always considered executable in MSYS causing which
1.777 + # to not find them
1.778 + if test "x$new_path" = x \
1.779 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.780 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.781 + new_path="$path"
1.782 +
1.783 + windows_path="$new_path"
1.784 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.785 + unix_path=`$CYGPATH -u "$windows_path"`
1.786 + new_path="$unix_path"
1.787 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.788 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.789 + new_path="$unix_path"
1.790 + fi
1.791 +
1.792 + fi
1.793
1.794 if test "x$new_path" = x; then
1.795 # It's still not found. Now this is an unrecoverable error.
1.796 @@ -30660,6 +30878,23 @@
1.797
1.798
1.799 new_path=`$WHICH "$new_path" 2> /dev/null`
1.800 + # bat and cmd files are not always considered executable in MSYS causing which
1.801 + # to not find them
1.802 + if test "x$new_path" = x \
1.803 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.804 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.805 + new_path="$path"
1.806 +
1.807 + windows_path="$new_path"
1.808 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.809 + unix_path=`$CYGPATH -u "$windows_path"`
1.810 + new_path="$unix_path"
1.811 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.812 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.813 + new_path="$unix_path"
1.814 + fi
1.815 +
1.816 + fi
1.817
1.818 if test "x$new_path" = x; then
1.819 # It's still not found. Now this is an unrecoverable error.
1.820 @@ -31271,6 +31506,23 @@
1.821
1.822
1.823 new_path=`$WHICH "$new_path" 2> /dev/null`
1.824 + # bat and cmd files are not always considered executable in MSYS causing which
1.825 + # to not find them
1.826 + if test "x$new_path" = x \
1.827 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.828 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.829 + new_path="$path"
1.830 +
1.831 + windows_path="$new_path"
1.832 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.833 + unix_path=`$CYGPATH -u "$windows_path"`
1.834 + new_path="$unix_path"
1.835 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.836 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.837 + new_path="$unix_path"
1.838 + fi
1.839 +
1.840 + fi
1.841
1.842 if test "x$new_path" = x; then
1.843 # It's still not found. Now this is an unrecoverable error.
1.844 @@ -31790,6 +32042,23 @@
1.845
1.846
1.847 new_path=`$WHICH "$new_path" 2> /dev/null`
1.848 + # bat and cmd files are not always considered executable in MSYS causing which
1.849 + # to not find them
1.850 + if test "x$new_path" = x \
1.851 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.852 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.853 + new_path="$path"
1.854 +
1.855 + windows_path="$new_path"
1.856 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.857 + unix_path=`$CYGPATH -u "$windows_path"`
1.858 + new_path="$unix_path"
1.859 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.860 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.861 + new_path="$unix_path"
1.862 + fi
1.863 +
1.864 + fi
1.865
1.866 if test "x$new_path" = x; then
1.867 # It's still not found. Now this is an unrecoverable error.
1.868 @@ -32241,6 +32510,23 @@
1.869
1.870
1.871 new_path=`$WHICH "$new_path" 2> /dev/null`
1.872 + # bat and cmd files are not always considered executable in MSYS causing which
1.873 + # to not find them
1.874 + if test "x$new_path" = x \
1.875 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.876 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.877 + new_path="$path"
1.878 +
1.879 + windows_path="$new_path"
1.880 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.881 + unix_path=`$CYGPATH -u "$windows_path"`
1.882 + new_path="$unix_path"
1.883 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.884 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.885 + new_path="$unix_path"
1.886 + fi
1.887 +
1.888 + fi
1.889
1.890 if test "x$new_path" = x; then
1.891 # It's still not found. Now this is an unrecoverable error.
1.892 @@ -32565,6 +32851,23 @@
1.893
1.894
1.895 new_path=`$WHICH "$new_path" 2> /dev/null`
1.896 + # bat and cmd files are not always considered executable in MSYS causing which
1.897 + # to not find them
1.898 + if test "x$new_path" = x \
1.899 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.900 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.901 + new_path="$path"
1.902 +
1.903 + windows_path="$new_path"
1.904 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.905 + unix_path=`$CYGPATH -u "$windows_path"`
1.906 + new_path="$unix_path"
1.907 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.908 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.909 + new_path="$unix_path"
1.910 + fi
1.911 +
1.912 + fi
1.913
1.914 if test "x$new_path" = x; then
1.915 # It's still not found. Now this is an unrecoverable error.
1.916 @@ -32885,6 +33188,23 @@
1.917
1.918
1.919 new_path=`$WHICH "$new_path" 2> /dev/null`
1.920 + # bat and cmd files are not always considered executable in MSYS causing which
1.921 + # to not find them
1.922 + if test "x$new_path" = x \
1.923 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.924 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.925 + new_path="$path"
1.926 +
1.927 + windows_path="$new_path"
1.928 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.929 + unix_path=`$CYGPATH -u "$windows_path"`
1.930 + new_path="$unix_path"
1.931 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.932 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.933 + new_path="$unix_path"
1.934 + fi
1.935 +
1.936 + fi
1.937
1.938 if test "x$new_path" = x; then
1.939 # It's still not found. Now this is an unrecoverable error.
1.940 @@ -33187,6 +33507,23 @@
1.941
1.942
1.943 new_path=`$WHICH "$new_path" 2> /dev/null`
1.944 + # bat and cmd files are not always considered executable in MSYS causing which
1.945 + # to not find them
1.946 + if test "x$new_path" = x \
1.947 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.948 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.949 + new_path="$path"
1.950 +
1.951 + windows_path="$new_path"
1.952 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.953 + unix_path=`$CYGPATH -u "$windows_path"`
1.954 + new_path="$unix_path"
1.955 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.956 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.957 + new_path="$unix_path"
1.958 + fi
1.959 +
1.960 + fi
1.961
1.962 if test "x$new_path" = x; then
1.963 # It's still not found. Now this is an unrecoverable error.
1.964 @@ -33641,6 +33978,23 @@
1.965
1.966
1.967 new_path=`$WHICH "$new_path" 2> /dev/null`
1.968 + # bat and cmd files are not always considered executable in MSYS causing which
1.969 + # to not find them
1.970 + if test "x$new_path" = x \
1.971 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.972 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.973 + new_path="$path"
1.974 +
1.975 + windows_path="$new_path"
1.976 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.977 + unix_path=`$CYGPATH -u "$windows_path"`
1.978 + new_path="$unix_path"
1.979 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.980 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.981 + new_path="$unix_path"
1.982 + fi
1.983 +
1.984 + fi
1.985
1.986 if test "x$new_path" = x; then
1.987 # It's still not found. Now this is an unrecoverable error.
1.988 @@ -34092,6 +34446,23 @@
1.989
1.990
1.991 new_path=`$WHICH "$new_path" 2> /dev/null`
1.992 + # bat and cmd files are not always considered executable in MSYS causing which
1.993 + # to not find them
1.994 + if test "x$new_path" = x \
1.995 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.996 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.997 + new_path="$path"
1.998 +
1.999 + windows_path="$new_path"
1.1000 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1001 + unix_path=`$CYGPATH -u "$windows_path"`
1.1002 + new_path="$unix_path"
1.1003 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1004 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1005 + new_path="$unix_path"
1.1006 + fi
1.1007 +
1.1008 + fi
1.1009
1.1010 if test "x$new_path" = x; then
1.1011 # It's still not found. Now this is an unrecoverable error.
1.1012 @@ -34543,6 +34914,23 @@
1.1013
1.1014
1.1015 new_path=`$WHICH "$new_path" 2> /dev/null`
1.1016 + # bat and cmd files are not always considered executable in MSYS causing which
1.1017 + # to not find them
1.1018 + if test "x$new_path" = x \
1.1019 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1020 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1021 + new_path="$path"
1.1022 +
1.1023 + windows_path="$new_path"
1.1024 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1025 + unix_path=`$CYGPATH -u "$windows_path"`
1.1026 + new_path="$unix_path"
1.1027 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1028 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1029 + new_path="$unix_path"
1.1030 + fi
1.1031 +
1.1032 + fi
1.1033
1.1034 if test "x$new_path" = x; then
1.1035 # It's still not found. Now this is an unrecoverable error.
1.1036 @@ -34995,6 +35383,23 @@
1.1037
1.1038
1.1039 new_path=`$WHICH "$new_path" 2> /dev/null`
1.1040 + # bat and cmd files are not always considered executable in MSYS causing which
1.1041 + # to not find them
1.1042 + if test "x$new_path" = x \
1.1043 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1044 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1045 + new_path="$path"
1.1046 +
1.1047 + windows_path="$new_path"
1.1048 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1049 + unix_path=`$CYGPATH -u "$windows_path"`
1.1050 + new_path="$unix_path"
1.1051 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1052 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1053 + new_path="$unix_path"
1.1054 + fi
1.1055 +
1.1056 + fi
1.1057
1.1058 if test "x$new_path" = x; then
1.1059 # It's still not found. Now this is an unrecoverable error.
1.1060 @@ -35558,6 +35963,23 @@
1.1061
1.1062
1.1063 new_path=`$WHICH "$new_path" 2> /dev/null`
1.1064 + # bat and cmd files are not always considered executable in MSYS causing which
1.1065 + # to not find them
1.1066 + if test "x$new_path" = x \
1.1067 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1068 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1069 + new_path="$path"
1.1070 +
1.1071 + windows_path="$new_path"
1.1072 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1073 + unix_path=`$CYGPATH -u "$windows_path"`
1.1074 + new_path="$unix_path"
1.1075 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1076 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1077 + new_path="$unix_path"
1.1078 + fi
1.1079 +
1.1080 + fi
1.1081
1.1082 if test "x$new_path" = x; then
1.1083 # It's still not found. Now this is an unrecoverable error.
1.1084 @@ -36162,6 +36584,23 @@
1.1085
1.1086
1.1087 new_path=`$WHICH "$new_path" 2> /dev/null`
1.1088 + # bat and cmd files are not always considered executable in MSYS causing which
1.1089 + # to not find them
1.1090 + if test "x$new_path" = x \
1.1091 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1092 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1093 + new_path="$path"
1.1094 +
1.1095 + windows_path="$new_path"
1.1096 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1097 + unix_path=`$CYGPATH -u "$windows_path"`
1.1098 + new_path="$unix_path"
1.1099 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1100 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1101 + new_path="$unix_path"
1.1102 + fi
1.1103 +
1.1104 + fi
1.1105
1.1106 if test "x$new_path" = x; then
1.1107 # It's still not found. Now this is an unrecoverable error.
1.1108 @@ -36732,6 +37171,23 @@
1.1109
1.1110
1.1111 new_path=`$WHICH "$new_path" 2> /dev/null`
1.1112 + # bat and cmd files are not always considered executable in MSYS causing which
1.1113 + # to not find them
1.1114 + if test "x$new_path" = x \
1.1115 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1116 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1117 + new_path="$path"
1.1118 +
1.1119 + windows_path="$new_path"
1.1120 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1121 + unix_path=`$CYGPATH -u "$windows_path"`
1.1122 + new_path="$unix_path"
1.1123 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1124 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1125 + new_path="$unix_path"
1.1126 + fi
1.1127 +
1.1128 + fi
1.1129
1.1130 if test "x$new_path" = x; then
1.1131 # It's still not found. Now this is an unrecoverable error.
1.1132 @@ -37299,6 +37755,23 @@
1.1133
1.1134
1.1135 new_path=`$WHICH "$new_path" 2> /dev/null`
1.1136 + # bat and cmd files are not always considered executable in MSYS causing which
1.1137 + # to not find them
1.1138 + if test "x$new_path" = x \
1.1139 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1140 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1141 + new_path="$path"
1.1142 +
1.1143 + windows_path="$new_path"
1.1144 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1145 + unix_path=`$CYGPATH -u "$windows_path"`
1.1146 + new_path="$unix_path"
1.1147 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1148 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1149 + new_path="$unix_path"
1.1150 + fi
1.1151 +
1.1152 + fi
1.1153
1.1154 if test "x$new_path" = x; then
1.1155 # It's still not found. Now this is an unrecoverable error.
1.1156 @@ -37775,6 +38248,23 @@
1.1157
1.1158
1.1159 new_path=`$WHICH "$new_path" 2> /dev/null`
1.1160 + # bat and cmd files are not always considered executable in MSYS causing which
1.1161 + # to not find them
1.1162 + if test "x$new_path" = x \
1.1163 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1164 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1165 + new_path="$path"
1.1166 +
1.1167 + windows_path="$new_path"
1.1168 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1169 + unix_path=`$CYGPATH -u "$windows_path"`
1.1170 + new_path="$unix_path"
1.1171 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1172 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1173 + new_path="$unix_path"
1.1174 + fi
1.1175 +
1.1176 + fi
1.1177
1.1178 if test "x$new_path" = x; then
1.1179 # It's still not found. Now this is an unrecoverable error.
1.1180 @@ -38226,6 +38716,23 @@
1.1181
1.1182
1.1183 new_path=`$WHICH "$new_path" 2> /dev/null`
1.1184 + # bat and cmd files are not always considered executable in MSYS causing which
1.1185 + # to not find them
1.1186 + if test "x$new_path" = x \
1.1187 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1188 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1189 + new_path="$path"
1.1190 +
1.1191 + windows_path="$new_path"
1.1192 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1193 + unix_path=`$CYGPATH -u "$windows_path"`
1.1194 + new_path="$unix_path"
1.1195 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1196 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1197 + new_path="$unix_path"
1.1198 + fi
1.1199 +
1.1200 + fi
1.1201
1.1202 if test "x$new_path" = x; then
1.1203 # It's still not found. Now this is an unrecoverable error.
1.1204 @@ -38677,6 +39184,23 @@
1.1205
1.1206
1.1207 new_path=`$WHICH "$new_path" 2> /dev/null`
1.1208 + # bat and cmd files are not always considered executable in MSYS causing which
1.1209 + # to not find them
1.1210 + if test "x$new_path" = x \
1.1211 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1212 + && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1213 + new_path="$path"
1.1214 +
1.1215 + windows_path="$new_path"
1.1216 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1217 + unix_path=`$CYGPATH -u "$windows_path"`
1.1218 + new_path="$unix_path"
1.1219 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1220 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1221 + new_path="$unix_path"
1.1222 + fi
1.1223 +
1.1224 + fi
1.1225
1.1226 if test "x$new_path" = x; then
1.1227 # It's still not found. Now this is an unrecoverable error.
1.1228 @@ -46741,12 +47265,22 @@
1.1229 { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.1230 $as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.1231 MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.1232 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1233 - CORRECT_MSVCR_ARCH=386
1.1234 - else
1.1235 - CORRECT_MSVCR_ARCH=x86-64
1.1236 - fi
1.1237 - if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.1238 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1239 + # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit"
1.1240 + # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems.
1.1241 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1242 + CORRECT_MSVCR_ARCH="PE32 executable"
1.1243 + else
1.1244 + CORRECT_MSVCR_ARCH="PE32+ executable"
1.1245 + fi
1.1246 + else
1.1247 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1248 + CORRECT_MSVCR_ARCH=386
1.1249 + else
1.1250 + CORRECT_MSVCR_ARCH=x86-64
1.1251 + fi
1.1252 + fi
1.1253 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
1.1254 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.1255 $as_echo "ok" >&6; }
1.1256 MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.1257 @@ -46797,12 +47331,22 @@
1.1258 { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.1259 $as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.1260 MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.1261 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1262 - CORRECT_MSVCR_ARCH=386
1.1263 - else
1.1264 - CORRECT_MSVCR_ARCH=x86-64
1.1265 - fi
1.1266 - if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.1267 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1268 + # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit"
1.1269 + # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems.
1.1270 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1271 + CORRECT_MSVCR_ARCH="PE32 executable"
1.1272 + else
1.1273 + CORRECT_MSVCR_ARCH="PE32+ executable"
1.1274 + fi
1.1275 + else
1.1276 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1277 + CORRECT_MSVCR_ARCH=386
1.1278 + else
1.1279 + CORRECT_MSVCR_ARCH=x86-64
1.1280 + fi
1.1281 + fi
1.1282 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
1.1283 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.1284 $as_echo "ok" >&6; }
1.1285 MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.1286 @@ -46835,12 +47379,22 @@
1.1287 { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.1288 $as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.1289 MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.1290 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1291 - CORRECT_MSVCR_ARCH=386
1.1292 - else
1.1293 - CORRECT_MSVCR_ARCH=x86-64
1.1294 - fi
1.1295 - if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.1296 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1297 + # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit"
1.1298 + # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems.
1.1299 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1300 + CORRECT_MSVCR_ARCH="PE32 executable"
1.1301 + else
1.1302 + CORRECT_MSVCR_ARCH="PE32+ executable"
1.1303 + fi
1.1304 + else
1.1305 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1306 + CORRECT_MSVCR_ARCH=386
1.1307 + else
1.1308 + CORRECT_MSVCR_ARCH=x86-64
1.1309 + fi
1.1310 + fi
1.1311 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
1.1312 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.1313 $as_echo "ok" >&6; }
1.1314 MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.1315 @@ -46883,12 +47437,22 @@
1.1316 { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.1317 $as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.1318 MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.1319 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1320 - CORRECT_MSVCR_ARCH=386
1.1321 - else
1.1322 - CORRECT_MSVCR_ARCH=x86-64
1.1323 - fi
1.1324 - if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.1325 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1326 + # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit"
1.1327 + # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems.
1.1328 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1329 + CORRECT_MSVCR_ARCH="PE32 executable"
1.1330 + else
1.1331 + CORRECT_MSVCR_ARCH="PE32+ executable"
1.1332 + fi
1.1333 + else
1.1334 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1335 + CORRECT_MSVCR_ARCH=386
1.1336 + else
1.1337 + CORRECT_MSVCR_ARCH=x86-64
1.1338 + fi
1.1339 + fi
1.1340 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
1.1341 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.1342 $as_echo "ok" >&6; }
1.1343 MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.1344 @@ -46936,12 +47500,22 @@
1.1345 { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.1346 $as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.1347 MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.1348 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1349 - CORRECT_MSVCR_ARCH=386
1.1350 - else
1.1351 - CORRECT_MSVCR_ARCH=x86-64
1.1352 - fi
1.1353 - if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.1354 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1355 + # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit"
1.1356 + # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems.
1.1357 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1358 + CORRECT_MSVCR_ARCH="PE32 executable"
1.1359 + else
1.1360 + CORRECT_MSVCR_ARCH="PE32+ executable"
1.1361 + fi
1.1362 + else
1.1363 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1364 + CORRECT_MSVCR_ARCH=386
1.1365 + else
1.1366 + CORRECT_MSVCR_ARCH=x86-64
1.1367 + fi
1.1368 + fi
1.1369 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
1.1370 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.1371 $as_echo "ok" >&6; }
1.1372 MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.1373 @@ -46985,12 +47559,22 @@
1.1374 { $as_echo "$as_me:${as_lineno-$LINENO}: checking found msvcr100.dll architecture" >&5
1.1375 $as_echo_n "checking found msvcr100.dll architecture... " >&6; }
1.1376 MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"`
1.1377 - if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1378 - CORRECT_MSVCR_ARCH=386
1.1379 - else
1.1380 - CORRECT_MSVCR_ARCH=x86-64
1.1381 - fi
1.1382 - if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then
1.1383 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1384 + # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit"
1.1385 + # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems.
1.1386 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1387 + CORRECT_MSVCR_ARCH="PE32 executable"
1.1388 + else
1.1389 + CORRECT_MSVCR_ARCH="PE32+ executable"
1.1390 + fi
1.1391 + else
1.1392 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.1393 + CORRECT_MSVCR_ARCH=386
1.1394 + else
1.1395 + CORRECT_MSVCR_ARCH=x86-64
1.1396 + fi
1.1397 + fi
1.1398 + if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
1.1399 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.1400 $as_echo "ok" >&6; }
1.1401 MSVCR_DLL="$POSSIBLE_MSVCR_DLL"
1.1402 @@ -47933,7 +48517,7 @@
1.1403
1.1404 # Check for some common pitfalls
1.1405
1.1406 - if test x"$OPENJDK_BUILD_OS" = xwindows; then
1.1407 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1408 file_to_test="$SRC_ROOT/LICENSE"
1.1409 if test `$STAT -c '%a' "$file_to_test"` -lt 400; then
1.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
