Mercurial > jdk8-mips64-public / file comparison
comparison: common/autoconf/toolchain_windows.m4
common/autoconf/toolchain_windows.m4
- changeset 2219
- cb1203f48728
- parent 2209
- cddffb220808
- child 2220
- 47fda751abb6
equal
deleted
inserted
replaced
| 2216:0c4c976612d3 | 2219:cb1203f48728 |
|---|---|
| 242 AC_MSG_NOTICE([Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD]) | 242 AC_MSG_NOTICE([Found msvcr100.dll at $POSSIBLE_MSVCR_DLL using $METHOD]) |
| 243 | 243 |
| 244 # Need to check if the found msvcr is correct architecture | 244 # Need to check if the found msvcr is correct architecture |
| 245 AC_MSG_CHECKING([found msvcr100.dll architecture]) | 245 AC_MSG_CHECKING([found msvcr100.dll architecture]) |
| 246 MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"` | 246 MSVCR_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCR_DLL"` |
| 247 if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then | 247 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
| 248 CORRECT_MSVCR_ARCH=386 | 248 # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit" |
| 249 else | 249 # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems. |
| 250 CORRECT_MSVCR_ARCH=x86-64 | 250 if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then |
| 251 fi | 251 CORRECT_MSVCR_ARCH="PE32 executable" |
| 252 if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP $CORRECT_MSVCR_ARCH 2>&1 > /dev/null; then | 252 else |
| 253 CORRECT_MSVCR_ARCH="PE32+ executable" | |
| 254 fi | |
| 255 else | |
| 256 if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then | |
| 257 CORRECT_MSVCR_ARCH=386 | |
| 258 else | |
| 259 CORRECT_MSVCR_ARCH=x86-64 | |
| 260 fi | |
| 261 fi | |
| 262 if $ECHO "$MSVCR_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then | |
| 253 AC_MSG_RESULT([ok]) | 263 AC_MSG_RESULT([ok]) |
| 254 MSVCR_DLL="$POSSIBLE_MSVCR_DLL" | 264 MSVCR_DLL="$POSSIBLE_MSVCR_DLL" |
| 255 AC_MSG_CHECKING([for msvcr100.dll]) | 265 AC_MSG_CHECKING([for msvcr100.dll]) |
| 256 AC_MSG_RESULT([$MSVCR_DLL]) | 266 AC_MSG_RESULT([$MSVCR_DLL]) |
| 257 else | 267 else |
