1.1 --- a/common/autoconf/toolchain.m4 Sun Mar 18 15:15:36 2018 -0700
1.2 +++ b/common/autoconf/toolchain.m4 Tue Mar 20 09:19:10 2018 -0700
1.3 @@ -265,11 +265,11 @@
1.4 # otherwise we might pick up cross-compilers which don't use standard naming.
1.5 # Otherwise, we'll set the BUILD_tools to the native tools, but that'll have
1.6 # to wait until they are properly discovered.
1.7 - AC_PATH_PROGS(BUILD_CC, [cl cc gcc])
1.8 + BASIC_PATH_PROGS(BUILD_CC, [cl cc gcc])
1.9 BASIC_FIXUP_EXECUTABLE(BUILD_CC)
1.10 - AC_PATH_PROGS(BUILD_CXX, [cl CC g++])
1.11 + BASIC_PATH_PROGS(BUILD_CXX, [cl CC g++])
1.12 BASIC_FIXUP_EXECUTABLE(BUILD_CXX)
1.13 - AC_PATH_PROG(BUILD_LD, ld)
1.14 + BASIC_PATH_PROGS(BUILD_LD, ld)
1.15 BASIC_FIXUP_EXECUTABLE(BUILD_LD)
1.16 fi
1.17 AC_SUBST(BUILD_CC)
1.18 @@ -470,7 +470,7 @@
1.19 AC_SUBST(LDEXECXX)
1.20
1.21 if test "x$OPENJDK_TARGET_OS" != xwindows; then
1.22 - AC_CHECK_TOOL(AR, ar)
1.23 + BASIC_CHECK_TOOLS(AR, ar)
1.24 BASIC_FIXUP_EXECUTABLE(AR)
1.25 fi
1.26 if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.27 @@ -598,7 +598,7 @@
1.28
1.29 # Find the right assembler.
1.30 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.31 - AC_PATH_PROG(AS, as)
1.32 + BASIC_PATH_PROGS(AS, as)
1.33 BASIC_FIXUP_EXECUTABLE(AS)
1.34 else
1.35 AS="$CC -c"
1.36 @@ -606,38 +606,38 @@
1.37 AC_SUBST(AS)
1.38
1.39 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.40 - AC_PATH_PROG(NM, nm)
1.41 + BASIC_PATH_PROGS(NM, nm)
1.42 BASIC_FIXUP_EXECUTABLE(NM)
1.43 - AC_PATH_PROG(GNM, gnm)
1.44 + BASIC_PATH_PROGS(GNM, gnm)
1.45 BASIC_FIXUP_EXECUTABLE(GNM)
1.46 - AC_PATH_PROG(STRIP, strip)
1.47 + BASIC_PATH_PROGS(STRIP, strip)
1.48 BASIC_FIXUP_EXECUTABLE(STRIP)
1.49 - AC_PATH_PROG(MCS, mcs)
1.50 + BASIC_PATH_PROGS(MCS, mcs)
1.51 BASIC_FIXUP_EXECUTABLE(MCS)
1.52 elif test "x$OPENJDK_TARGET_OS" != xwindows; then
1.53 AC_PATH_PROG(OTOOL, otool)
1.54 if test "x$OTOOL" = "x"; then
1.55 OTOOL="true"
1.56 fi
1.57 - AC_CHECK_TOOL(NM, nm)
1.58 + BASIC_CHECK_TOOLS(NM, nm)
1.59 BASIC_FIXUP_EXECUTABLE(NM)
1.60 GNM="$NM"
1.61 AC_SUBST(GNM)
1.62 - AC_CHECK_TOOL(STRIP, strip)
1.63 + BASIC_CHECK_TOOLS(STRIP, strip)
1.64 BASIC_FIXUP_EXECUTABLE(STRIP)
1.65 fi
1.66
1.67 # objcopy is used for moving debug symbols to separate files when
1.68 # full debug symbols are enabled.
1.69 if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
1.70 - AC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy])
1.71 + BASIC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy])
1.72 # Only call fixup if objcopy was found.
1.73 if test -n "$OBJCOPY"; then
1.74 BASIC_FIXUP_EXECUTABLE(OBJCOPY)
1.75 fi
1.76 fi
1.77
1.78 - AC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
1.79 + BASIC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
1.80 if test "x$OBJDUMP" != x; then
1.81 # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE bails if argument is missing.
1.82 BASIC_FIXUP_EXECUTABLE(OBJDUMP)
1.83 @@ -1413,7 +1413,7 @@
1.84 AC_MSG_RESULT($JTREGEXE)
1.85 else
1.86 # try to find jtreg on path
1.87 - BASIC_REQUIRE_PROG(JTREGEXE, jtreg)
1.88 + BASIC_REQUIRE_PROGS(JTREGEXE, jtreg)
1.89 JT_HOME="`$DIRNAME $JTREGEXE`"
1.90 fi
1.91 fi
