8145206: Configure broken on Macosx

Reviewed-by: tbell
battleblow · Dec 11, 2015 · 573adf3 · 573adf3
1 parent a763eca
commit 573adf3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
@@ -4728,7 +4728,7 @@ VS_SDK_PLATFORM_NAME_2013=
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1449838377
+DATE_WHEN_GENERATED=1449850507
 
 ###############################################################################
 #
@@ -47667,10 +47667,12 @@ $as_echo "$NATIVE_DEBUG_SYMBOLS" >&6; }
 
   if test "x$NATIVE_DEBUG_SYMBOLS" = xzipped; then
 
-    if test "x$OBJCOPY" = x; then
-      # explicit enabling of enable-debug-symbols and can't find objcopy
-      # this is an error
-      as_fn_error $? "Unable to find objcopy, cannot enable native debug symbols" "$LINENO" 5
+    if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
+      if test "x$OBJCOPY" = x; then
+        # enabling of enable-debug-symbols and can't find objcopy
+        # this is an error
+        as_fn_error $? "Unable to find objcopy, cannot enable native debug symbols" "$LINENO" 5
+      fi
     fi
 
     ENABLE_DEBUG_SYMBOLS=true
@@ -47690,10 +47692,12 @@ $as_echo "$NATIVE_DEBUG_SYMBOLS" >&6; }
     STRIP=""
   elif test "x$NATIVE_DEBUG_SYMBOLS" = xexternal; then
 
-    if test "x$OBJCOPY" = x; then
-      # explicit enabling of enable-debug-symbols and can't find objcopy
-      # this is an error
-      as_fn_error $? "Unable to find objcopy, cannot enable native debug symbols" "$LINENO" 5
+    if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
+      if test "x$OBJCOPY" = x; then
+        # enabling of enable-debug-symbols and can't find objcopy
+        # this is an error
+        as_fn_error $? "Unable to find objcopy, cannot enable native debug symbols" "$LINENO" 5
+      fi
     fi
 
     ENABLE_DEBUG_SYMBOLS=true

diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4
@@ -505,10 +505,12 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
 
   if test "x$NATIVE_DEBUG_SYMBOLS" = xzipped; then
 
-    if test "x$OBJCOPY" = x; then
-      # explicit enabling of enable-debug-symbols and can't find objcopy
-      # this is an error
-      AC_MSG_ERROR([Unable to find objcopy, cannot enable native debug symbols])
+    if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
+      if test "x$OBJCOPY" = x; then
+        # enabling of enable-debug-symbols and can't find objcopy
+        # this is an error
+        AC_MSG_ERROR([Unable to find objcopy, cannot enable native debug symbols])
+      fi
     fi
 
     ENABLE_DEBUG_SYMBOLS=true
@@ -528,10 +530,12 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
     STRIP=""
   elif test "x$NATIVE_DEBUG_SYMBOLS" = xexternal; then
 
-    if test "x$OBJCOPY" = x; then
-      # explicit enabling of enable-debug-symbols and can't find objcopy
-      # this is an error
-      AC_MSG_ERROR([Unable to find objcopy, cannot enable native debug symbols])
+    if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
+      if test "x$OBJCOPY" = x; then
+        # enabling of enable-debug-symbols and can't find objcopy
+        # this is an error
+        AC_MSG_ERROR([Unable to find objcopy, cannot enable native debug symbols])
+      fi
     fi
 
     ENABLE_DEBUG_SYMBOLS=true