[Libreoffice-commits] .: solenv/inc

[Lubos Lunak]

 solenv/inc/settings.mk |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit bc0825790c47b774391019af8758c3f4fa1309bf
Author: Lubos Lunak <l.lunak at suse.cz>
Date:   Wed Oct 20 15:21:07 2010 +0200

    prevent symbols cflags from overriding debug cflags
    
    The use case here is configuring with --enable-symbols=small (which
    enables -g1 for gcc), and then doing 'dmake debug=true', which
    enables -g, however the -g1 is later in the command line, so it
    takes precedence. And I don't feel like trying to redo the whole
    ordering of gcc command lines everywhere, while this looks safe.

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index e2cf990..e16f602 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1098,9 +1098,12 @@ CDEFS+= -DSUPD=$(UPD)
 
 # flags to enable build with symbols; required for crashdump feature
 .IF ("$(ENABLE_CRASHDUMP)"!="" && "$(ENABLE_CRASHDUMP)"!="DUMMY") || "$(ENABLE_SYMBOLS)"!=""
+# if debug is enabled, this may enable less debug info than debug, so rely just on debug
+.IF "$(debug)" == ""
 CFLAGSENABLESYMBOLS_CC_ONLY*=$(CFLAGSENABLESYMBOLS)
 CFLAGSCXX+=$(CFLAGSENABLESYMBOLS)
 CFLAGSCC+=$(CFLAGSENABLESYMBOLS_CC_ONLY)
+.ENDIF          # "$(DEBUG)" == ""
 .ENDIF          # ("$(ENABLE_CRASHDUMP)"!="" && "$(ENABLE_CRASHDUMP)"!="DUMMY") || "$(ENABLE_SYMBOLS)"!=""
 
 .IF "$(profile)"!=""