8145206: Configure broken on Macosx

Reviewed-by: tbell
This commit is contained in:
Erik Joelsson 2015-12-11 17:15:48 +01:00
parent 401ff06f3b
commit 7310665243
2 changed files with 25 additions and 17 deletions

View File

@ -4728,7 +4728,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # 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$NATIVE_DEBUG_SYMBOLS" = xzipped; then
if test "x$OBJCOPY" = x; then if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
# explicit enabling of enable-debug-symbols and can't find objcopy if test "x$OBJCOPY" = x; then
# this is an error # enabling of enable-debug-symbols and can't find objcopy
as_fn_error $? "Unable to find objcopy, cannot enable native debug symbols" "$LINENO" 5 # this is an error
as_fn_error $? "Unable to find objcopy, cannot enable native debug symbols" "$LINENO" 5
fi
fi fi
ENABLE_DEBUG_SYMBOLS=true ENABLE_DEBUG_SYMBOLS=true
@ -47690,10 +47692,12 @@ $as_echo "$NATIVE_DEBUG_SYMBOLS" >&6; }
STRIP="" STRIP=""
elif test "x$NATIVE_DEBUG_SYMBOLS" = xexternal; then elif test "x$NATIVE_DEBUG_SYMBOLS" = xexternal; then
if test "x$OBJCOPY" = x; then if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
# explicit enabling of enable-debug-symbols and can't find objcopy if test "x$OBJCOPY" = x; then
# this is an error # enabling of enable-debug-symbols and can't find objcopy
as_fn_error $? "Unable to find objcopy, cannot enable native debug symbols" "$LINENO" 5 # this is an error
as_fn_error $? "Unable to find objcopy, cannot enable native debug symbols" "$LINENO" 5
fi
fi fi
ENABLE_DEBUG_SYMBOLS=true ENABLE_DEBUG_SYMBOLS=true

View File

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