1.1 --- a/common/autoconf/jdk-options.m4 Tue Dec 11 11:29:58 2012 +0100
1.2 +++ b/common/autoconf/jdk-options.m4 Tue Dec 11 11:33:34 2012 +0100
1.3 @@ -432,32 +432,30 @@
1.4 # ENABLE_DEBUG_SYMBOLS
1.5 # This must be done after the toolchain is setup, since we're looking at objcopy.
1.6 #
1.7 -ENABLE_DEBUG_SYMBOLS=default
1.8 -
1.9 -# default on macosx is no...
1.10 -if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.11 - ENABLE_DEBUG_SYMBOLS=no
1.12 -fi
1.13 -
1.14 AC_ARG_ENABLE([debug-symbols],
1.15 - [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])],
1.16 - [ENABLE_DEBUG_SYMBOLS=${enable_debug_symbols}],
1.17 -)
1.18 + [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])])
1.19
1.20 AC_MSG_CHECKING([if we should generate debug symbols])
1.21
1.22 -if test "x$ENABLE_DEBUG_SYMBOLS" = "xyes" && test "x$OBJCOPY" = x; then
1.23 +if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then
1.24 # explicit enabling of enable-debug-symbols and can't find objcopy
1.25 # this is an error
1.26 AC_MSG_ERROR([Unable to find objcopy, cannot enable debug-symbols])
1.27 fi
1.28
1.29 -if test "x$ENABLE_DEBUG_SYMBOLS" = "xdefault"; then
1.30 +if test "x$enable_debug_symbols" = "xyes"; then
1.31 + ENABLE_DEBUG_SYMBOLS=true
1.32 +elif test "x$enable_debug_symbols" = "xno"; then
1.33 + ENABLE_DEBUG_SYMBOLS=false
1.34 +else
1.35 + # default on macosx is false
1.36 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.37 + ENABLE_DEBUG_SYMBOLS=false
1.38 # Default is on if objcopy is found, otherwise off
1.39 - if test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then
1.40 - ENABLE_DEBUG_SYMBOLS=yes
1.41 + elif test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then
1.42 + ENABLE_DEBUG_SYMBOLS=true
1.43 else
1.44 - ENABLE_DEBUG_SYMBOLS=no
1.45 + ENABLE_DEBUG_SYMBOLS=false
1.46 fi
1.47 fi
1.48
1.49 @@ -466,22 +464,16 @@
1.50 #
1.51 # ZIP_DEBUGINFO_FILES
1.52 #
1.53 -ZIP_DEBUGINFO_FILES=yes
1.54 -
1.55 AC_ARG_ENABLE([zip-debug-info],
1.56 - [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])],
1.57 - [ZIP_DEBUGINFO_FILES=${enable_zip_debug_info}],
1.58 -)
1.59 + [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])])
1.60
1.61 AC_MSG_CHECKING([if we should zip debug-info files])
1.62 -AC_MSG_RESULT([$ZIP_DEBUGINFO_FILES])
1.63 +AC_MSG_RESULT([${enable_zip_debug_info}])
1.64
1.65 -# Hotspot wants ZIP_DEBUGINFO_FILES to be 1 for yes
1.66 -# use that...
1.67 -if test "x$ZIP_DEBUGINFO_FILES" = "xyes"; then
1.68 - ZIP_DEBUGINFO_FILES=1
1.69 +if test "x${enable_zip_debug_info}" = "xno"; then
1.70 + ZIP_DEBUGINFO_FILES=false
1.71 else
1.72 - ZIP_DEBUGINFO_FILES=0
1.73 + ZIP_DEBUGINFO_FILES=true
1.74 fi
1.75
1.76 AC_SUBST(ENABLE_DEBUG_SYMBOLS)
