equal
deleted
inserted
replaced
476 |
476 |
477 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then |
477 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then |
478 AC_PATH_PROG(LIPO, lipo) |
478 AC_PATH_PROG(LIPO, lipo) |
479 BASIC_FIXUP_EXECUTABLE(LIPO) |
479 BASIC_FIXUP_EXECUTABLE(LIPO) |
480 fi |
480 fi |
|
481 |
|
482 TOOLCHAIN_SETUP_JTREG |
481 |
483 |
482 # Restore old path without tools dir |
484 # Restore old path without tools dir |
483 PATH="$OLD_PATH" |
485 PATH="$OLD_PATH" |
484 ]) |
486 ]) |
485 |
487 |
1087 TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([-m${OPENJDK_TARGET_CPU_BITS}], |
1089 TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([-m${OPENJDK_TARGET_CPU_BITS}], |
1088 [COMPILER_SUPPORTS_TARGET_BITS_FLAG=true], |
1090 [COMPILER_SUPPORTS_TARGET_BITS_FLAG=true], |
1089 [COMPILER_SUPPORTS_TARGET_BITS_FLAG=false]) |
1091 [COMPILER_SUPPORTS_TARGET_BITS_FLAG=false]) |
1090 AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG) |
1092 AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG) |
1091 ]) |
1093 ]) |
|
1094 |
|
1095 # Setup the JTREG paths |
|
1096 AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG], |
|
1097 [ |
|
1098 AC_ARG_WITH(jtreg, [AS_HELP_STRING([--with-jtreg], |
|
1099 [Regression Test Harness @<:@probed@:>@])]) |
|
1100 |
|
1101 AC_MSG_CHECKING([for JTReg Regression Test Harness]) |
|
1102 |
|
1103 if test "x$with_jtreg" != x; then |
|
1104 JT_HOME="$with_jtreg" |
|
1105 BASIC_FIXUP_PATH([JT_HOME]) |
|
1106 AC_MSG_RESULT($JT_HOME) |
|
1107 |
|
1108 # jtreg win32 script works for everybody |
|
1109 JTREGEXE="$JT_HOME/win32/bin/jtreg" |
|
1110 if test ! -f "$JTREGEXE"; then |
|
1111 AC_MSG_ERROR([JTReg executable does not exist: $JTREGEXE]) |
|
1112 fi |
|
1113 else |
|
1114 AC_MSG_RESULT(no) |
|
1115 fi |
|
1116 |
|
1117 AC_SUBST(JT_HOME) |
|
1118 AC_SUBST(JTREGEXE) |
|
1119 ]) |