Mercurial > jdk8-mips64-public / file comparison
comparison: common/autoconf/toolchain.m4
common/autoconf/toolchain.m4
- changeset 2223
- 01cc48ed67f3
- parent 2220
- 47fda751abb6
- child 2224
- 20daa32eec6f
equal
deleted
inserted
replaced
| 2222:7129b977c4af | 2223:01cc48ed67f3 |
|---|---|
| 806 if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then | 806 if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then |
| 807 # On Windows, double-check that we got the right compiler. | 807 # On Windows, double-check that we got the right compiler. |
| 808 CC_VERSION_OUTPUT=`$CC 2>&1 | $HEAD -n 1 | $TR -d '\r'` | 808 CC_VERSION_OUTPUT=`$CC 2>&1 | $HEAD -n 1 | $TR -d '\r'` |
| 809 COMPILER_CPU_TEST=`$ECHO $CC_VERSION_OUTPUT | $SED -n "s/^.* \(.*\)$/\1/p"` | 809 COMPILER_CPU_TEST=`$ECHO $CC_VERSION_OUTPUT | $SED -n "s/^.* \(.*\)$/\1/p"` |
| 810 if test "x$OPENJDK_TARGET_CPU" = "xx86"; then | 810 if test "x$OPENJDK_TARGET_CPU" = "xx86"; then |
| 811 if test "x$COMPILER_CPU_TEST" != "x80x86"; then | 811 if test "x$COMPILER_CPU_TEST" != "x80x86" -a "x$COMPILER_CPU_TEST" != "xx86"; then |
| 812 AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "80x86".]) | 812 AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "80x86" or "x86".]) |
| 813 fi | 813 fi |
| 814 elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then | 814 elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then |
| 815 if test "x$COMPILER_CPU_TEST" != "xx64"; then | 815 if test "x$COMPILER_CPU_TEST" != "xx64"; then |
| 816 AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "x64".]) | 816 AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "x64".]) |
| 817 fi | 817 fi |
