# HG changeset patch
# User tbell
# Date 1353362790 28800
# Node ID b82a851468d0c880973b83e725dfe0c88d37f87d
# Parent  c8c59639a854d8d19bb10687b96453343ed5db32
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

diff -r c8c59639a854 -r b82a851468d0 common/autoconf/generated-configure.sh
--- 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
diff -r c8c59639a854 -r b82a851468d0 common/autoconf/toolchain.m4
--- 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])