changeset 34495:b8008470cbd0

8145206: Configure broken on Macosx Reviewed-by: tbell
author erikj
date Fri, 11 Dec 2015 17:15:48 +0100
parents 3b756754f957
children b05757ebc035
files common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4
diffstat 2 files changed, 25 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Fri Dec 11 14:20:39 2015 +0100
+++ b/common/autoconf/generated-configure.sh	Fri Dec 11 17:15:48 2015 +0100
@@ -4728,7 +4728,7 @@
 #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 @@
 
   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 @@
     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
--- a/common/autoconf/jdk-options.m4	Fri Dec 11 14:20:39 2015 +0100
+++ b/common/autoconf/jdk-options.m4	Fri Dec 11 17:15:48 2015 +0100
@@ -505,10 +505,12 @@
 
   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 @@
     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