diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-06 18:43:15 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-09-10 13:00:53 +0000 |
| commit | 717af0973f64bb7cff5f14bd0fb973355559cc70 (patch) | |
| tree | 205719707de02ab6d49e0ccdd34229f06d92930d /solenv/inc | |
| parent | e3b927787f3643f9e584cc80c974d5f907a94858 (diff) | |
gbuild: disable symbols on --enable-dbgutil --disable-symbols
Due to the setup of gb_DEBUGLEVEL in gbuild.mk, gb_SYMBOL was always
enabled when --enable-dbgutil is set, with no way to override it.
Fix that by turning configure's ENABLE_SYMBOLS into a tri-state, where
the new "FALSE" value, set by an explicit --disable-symbols, overrides
any implicit way of enabling symbols.
But by default an --enable-dbgutil still enables gb_SYMBOL.
Change-Id: I94c609863980ed1ab9c73d7a4861c394442b531d
(cherry picked from commit d9cbc837f84c415f5949a6893764dae8268f0d85)
Reviewed-on: https://gerrit.libreoffice.org/572
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/settings.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 9d01c5eff57d..ea4bb0ed6652 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1042,7 +1042,7 @@ CDEFS+= -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) CDEFS+= -DSUPD=$(UPD) # flags to enable build with symbols; required for crashdump feature -.IF ("$(ENABLE_CRASHDUMP)"!="" && "$(ENABLE_CRASHDUMP)"!="DUMMY") || "$(ENABLE_SYMBOLS)"!="" +.IF ("$(ENABLE_CRASHDUMP)"!="" && "$(ENABLE_CRASHDUMP)"!="DUMMY") || ("$(ENABLE_SYMBOLS)"!="" && "$(ENABLE_SYMBOLS)"!="FALSE") # if debug is enabled, this may enable less debug info than debug, so rely just on debug .IF "$(debug)" == "" CFLAGSENABLESYMBOLS_CC_ONLY*=$(CFLAGSENABLESYMBOLS) |