8003300: build-infra: fails on solaris when objcopy is not found

Mon, 19 Nov 2012 14:06:30 -0800

author
tbell
date
Mon, 19 Nov 2012 14:06:30 -0800
changeset 516
ecf751a69f6a
parent 515
06f146c05f49
child 517
f8b0bacd4de5

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

common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/autoconf/toolchain.m4 file | annotate | diff | comparison | revisions
     1.1 --- a/common/autoconf/generated-configure.sh	Thu Nov 15 00:54:54 2012 +0000
     1.2 +++ b/common/autoconf/generated-configure.sh	Mon Nov 19 14:06:30 2012 -0800
     1.3 @@ -3068,7 +3068,7 @@
     1.4  #CUSTOM_AUTOCONF_INCLUDE
     1.5  
     1.6  # Do not change or remove the following line, it is needed for consistency checks:
     1.7 -DATE_WHEN_GENERATED=1352917083
     1.8 +DATE_WHEN_GENERATED=1353361797
     1.9  
    1.10  ###############################################################################
    1.11  #
    1.12 @@ -26313,6 +26313,8 @@
    1.13    fi
    1.14  fi
    1.15  
    1.16 +    # Only call fixup if objcopy was found.
    1.17 +    if test -n "$OBJCOPY"; then
    1.18  
    1.19    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
    1.20  
    1.21 @@ -26576,6 +26578,7 @@
    1.22  $as_echo "$as_me: Rewriting OBJCOPY to \"$new_complete\"" >&6;}
    1.23    fi
    1.24  
    1.25 +    fi
    1.26  fi
    1.27  
    1.28  if test -n "$ac_tool_prefix"; then
     2.1 --- a/common/autoconf/toolchain.m4	Thu Nov 15 00:54:54 2012 +0000
     2.2 +++ b/common/autoconf/toolchain.m4	Mon Nov 19 14:06:30 2012 -0800
     2.3 @@ -437,7 +437,10 @@
     2.4  # full debug symbols are enabled.
     2.5  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
     2.6      AC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy])
     2.7 -    BASIC_FIXUP_EXECUTABLE(OBJCOPY)
     2.8 +    # Only call fixup if objcopy was found.
     2.9 +    if test -n "$OBJCOPY"; then
    2.10 +        BASIC_FIXUP_EXECUTABLE(OBJCOPY)
    2.11 +    fi
    2.12  fi
    2.13  
    2.14  AC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])

mercurial