1.1 --- a/common/autoconf/toolchain.m4 Mon Apr 08 14:07:32 2013 -0400
1.2 +++ b/common/autoconf/toolchain.m4 Tue Apr 09 09:42:20 2013 +0200
1.3 @@ -441,8 +441,10 @@
1.4 AC_SUBST(AS)
1.5
1.6 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.7 - AC_PATH_PROGS(NM, [gnm nm])
1.8 + AC_PATH_PROG(NM, nm)
1.9 BASIC_FIXUP_EXECUTABLE(NM)
1.10 + AC_PATH_PROG(GNM, gnm)
1.11 + BASIC_FIXUP_EXECUTABLE(GNM)
1.12 AC_PATH_PROG(STRIP, strip)
1.13 BASIC_FIXUP_EXECUTABLE(STRIP)
1.14 AC_PATH_PROG(MCS, mcs)
1.15 @@ -450,6 +452,8 @@
1.16 elif test "x$OPENJDK_TARGET_OS" != xwindows; then
1.17 AC_CHECK_TOOL(NM, nm)
1.18 BASIC_FIXUP_EXECUTABLE(NM)
1.19 + GNM="$NM"
1.20 + AC_SUBST(GNM)
1.21 AC_CHECK_TOOL(STRIP, strip)
1.22 BASIC_FIXUP_EXECUTABLE(STRIP)
1.23 fi
