1.1 --- a/make/common/Defs-linux.gmk	Thu Apr 16 19:10:32 2009 -0700
     1.2 +++ b/make/common/Defs-linux.gmk	Fri Apr 17 15:56:20 2009 +0100
     1.3 @@ -165,6 +165,12 @@
     1.4    endif
     1.5  endif
     1.6  
     1.7 +# DEBUG_BINARIES overrides everything, use full -g debug information
     1.8 +ifeq ($(DEBUG_BINARIES), true)
     1.9 +  DEBUG_FLAG = -g
    1.10 +  CFLAGS_REQUIRED += $(DEBUG_FLAG)
    1.11 +endif
    1.12 +
    1.13  CFLAGS_OPT      = $(CC_OPT)
    1.14  CFLAGS_DBG      = $(DEBUG_FLAG)
    1.15  CFLAGS_COMMON += $(CFLAGS_REQUIRED)
    1.16 @@ -240,8 +246,11 @@
    1.17  #
    1.18  ifeq ($(VARIANT), OPT)
    1.19    ifneq ($(NO_STRIP), true)
    1.20 -    # Debug 'strip -g' leaves local function Elf symbols (better stack traces)
    1.21 -    POST_STRIP_PROCESS = $(STRIP) -g
    1.22 +    ifneq ($(DEBUG_BINARIES), true)
    1.23 +      # Debug 'strip -g' leaves local function Elf symbols (better stack
    1.24 +      # traces)
    1.25 +      POST_STRIP_PROCESS = $(STRIP) -g
    1.26 +    endif
    1.27    endif
    1.28  endif
    1.29  

     2.1 --- a/make/sun/awt/mawt.gmk	Thu Apr 16 19:10:32 2009 -0700
     2.2 +++ b/make/sun/awt/mawt.gmk	Fri Apr 17 15:56:20 2009 +0100
     2.3 @@ -108,7 +108,9 @@
     2.4  #
     2.5  
     2.6  
     2.7 -#CFLAGS += -g
     2.8 +ifeq ($(DEBUG_BINARIES), true)
     2.9 +  CFLAGS += -g
    2.10 +endif
    2.11  ifeq ($(HEADLESS),true)
    2.12  CFLAGS += -DHEADLESS=$(HEADLESS)
    2.13  CPPFLAGS += -DHEADLESS=$(HEADLESS)