diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index c6803908a237b94f71f31a4ff15e25aa778346d7..dced36f3f3ace80a4e370febcb2e29a49db1de9c 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -3068,7 +3068,7 @@ fi
 #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 @@ esac
   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: error: Cannot locate the the path of OBJCOPY" >&2;}
 $as_echo "$as_me: Rewriting OBJCOPY to \"$new_complete\"" >&6;}
   fi
 
+    fi
 fi
 
 if test -n "$ac_tool_prefix"; then
diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
index eb8d2b1ccc57e828bf28bf39baef372413fb5c9f..8dc3fc7bb4b9a40caceb5193c1faa3fdc44eebc2 100644
--- a/common/autoconf/toolchain.m4
+++ b/common/autoconf/toolchain.m4
@@ -437,7 +437,10 @@ fi
 # 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])