make/linux/makefiles/defs.make

*** 140,152 ****
    endif
  endif
  
  ifeq ($(JDK6_OR_EARLIER),0)
    # Full Debug Symbols is supported on JDK7 or newer.
!   # Default is enabled with .debuginfo files ZIP'ed to save space.
  
!   ENABLE_FULL_DEBUG_SYMBOLS ?= 1
    # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
  
    ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
      # Default OBJCOPY comes from GNU Binutils on Linux:
      DEF_OBJCOPY=/usr/bin/objcopy
--- 140,180 ----
    endif
  endif
  
  ifeq ($(JDK6_OR_EARLIER),0)
    # Full Debug Symbols is supported on JDK7 or newer.
!   # The Full Debug Symbols (FDS) default for BUILD_FLAVOR == product
!   # builds is enabled with debug info files ZIP'ed to save space. For
!   # BUILD_FLAVOR != product builds, FDS is always enabled, after all a
!   # debug build without debug info isn't very useful.
!   # The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled.
!   #
!   # If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be
!   # disabled for a BUILD_FLAVOR == product build.
!   #
!   # Note: Use of a different variable name for the FDS override option
!   # versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS
!   # versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass
!   # in options via environment variables, use of distinct variables
!   # prevents strange behaviours. For example, in a BUILD_FLAVOR !=
!   # product build, the FULL_DEBUG_SYMBOLS environment variable will be
!   # 0, but the ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If
!   # the same variable name is used, then different values can be picked
!   # up by different parts of the build. Just to be clear, we only need
!   # two variable names because the incoming option value can be
!   # overridden in some situations, e.g., a BUILD_FLAVOR != product
!   # build.
  
!   ifeq ($(BUILD_FLAVOR), product)
!     FULL_DEBUG_SYMBOLS ?= 1
!     ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
!   else
!     # debug variants always get Full Debug Symbols (if available)
!     ENABLE_FULL_DEBUG_SYMBOLS = 1
!   endif
!   _JUNK_ := $(shell \
!     echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
    # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
  
    ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
      # Default OBJCOPY comes from GNU Binutils on Linux:
      DEF_OBJCOPY=/usr/bin/objcopy
*** 169,178 ****
--- 197,208 ----
  
    ifeq ($(OBJCOPY),)
      _JUNK_ := $(shell \
        echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files.")
      ENABLE_FULL_DEBUG_SYMBOLS=0
+     _JUNK_ := $(shell \
+       echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
    else
      _JUNK_ := $(shell \
        echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
  
      # Library stripping policies for .debuginfo configs: