Mercurial > hg > openjdk > aarch64-port
changeset 514:ecf751a69f6a
8003300: build-infra: fails on solaris when objcopy is not found
Summary: Only call BASIC_FIXUP_EXECUTABLE() if objcopy was found.
Reviewed-by: tbell
Contributed-by: erik.joelsson@oracle.com
| author | tbell |
|---|---|
| date | Mon, 19 Nov 2012 14:06:30 -0800 |
| parents | 06f146c05f49 |
| children | f8b0bacd4de5 |
| files | common/autoconf/generated-configure.sh common/autoconf/toolchain.m4 |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Thu Nov 15 00:54:54 2012 +0000 +++ b/common/autoconf/generated-configure.sh Mon Nov 19 14:06:30 2012 -0800 @@ -3068,7 +3068,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1352917083 +DATE_WHEN_GENERATED=1353361797 ############################################################################### # @@ -26313,6 +26313,8 @@ fi fi + # Only call fixup if objcopy was found. + if test -n "$OBJCOPY"; then if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then @@ -26576,6 +26578,7 @@ $as_echo "$as_me: Rewriting OBJCOPY to \"$new_complete\"" >&6;} fi + fi fi if test -n "$ac_tool_prefix"; then
--- a/common/autoconf/toolchain.m4 Thu Nov 15 00:54:54 2012 +0000 +++ b/common/autoconf/toolchain.m4 Mon Nov 19 14:06:30 2012 -0800 @@ -437,7 +437,10 @@ # full debug symbols are enabled. if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then AC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy]) - BASIC_FIXUP_EXECUTABLE(OBJCOPY) + # Only call fixup if objcopy was found. + if test -n "$OBJCOPY"; then + BASIC_FIXUP_EXECUTABLE(OBJCOPY) + fi fi AC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])