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/gbuild | |
| 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/gbuild')
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index a787e145db89..c0e5ad273975 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -76,12 +76,6 @@ else gb_PRODUCT := $(false) endif -ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),) -gb_SYMBOL := $(true) -else -gb_SYMBOL := $(false) -endif - gb_TIMELOG := 0 ifneq ($(strip $(TIMELOG)$(timelog)),) gb_TIMELOG := 1 @@ -117,8 +111,18 @@ ENABLE_DEBUG_FOR := all endif endif +ifeq ($(or $(ENABLE_SYMBOLS),$(enable_symbols)),FALSE) +gb_SYMBOL := $(false) +else +ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),) +gb_SYMBOL := $(true) +else ifneq ($(gb_DEBUGLEVEL),0) gb_SYMBOL := $(true) +else +gb_SYMBOL := $(false) +endif +endif endif ifneq ($(nodep),) |