diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-05-02 16:41:42 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-05-02 16:45:50 +0200 |
| commit | 9911ee515dd3d1e077dbf9c1fb4fd5c42a3c49b6 (patch) | |
| tree | 8ed9fa972466f268bb990e2d08d0f61197bc1c00 | |
| parent | d776f9433b6ca51472f4d6099526f71400b7bfda (diff) | |
make sure manual override on cmdline enables symbols
so that e.g. 'make dbglevel=2' works even if --enable-symbols disabled
it for the specific target
Change-Id: If2fff3ef8e42c3b35545b5d8101ef87380412cc7
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 6b1d18473c58..c7167a63a57b 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -79,10 +79,19 @@ else gb_PRODUCT := $(false) endif -ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),) -gb_SYMBOL := $(true) -else gb_SYMBOL := $(false) +ifneq ($(strip $(ENABLE_SYMBOLS)),) +gb_SYMBOL := $(true) +# make sure symbols are enabled if overriden using the command line +ifeq ($(origin ENABLE_SYMBOLS),command line) +ENABLE_SYMBOLS_FOR = all +endif +endif +ifneq ($(strip $(enable_symbols)),) +gb_SYMBOL := $(true) +ifeq ($(origin enable_symbols),command line) +ENABLE_SYMBOLS_FOR = all +endif endif gb_TIMELOG := 0 @@ -91,17 +100,32 @@ gb_TIMELOG := 1 endif gb_DEBUGLEVEL := 0 -ifneq ($(strip $(DEBUG)$(debug)),) +ifneq ($(strip $(DEBUG)),) +gb_DEBUGLEVEL := 1 +ifeq ($(origin DEBUG),command line) +ENABLE_SYMBOLS_FOR = all +endif +endif +ifneq ($(strip $(debug)),) gb_DEBUGLEVEL := 1 -else ifeq ($(gb_PRODUCT),$(false)) +ifeq ($(origin debug),command line) +ENABLE_SYMBOLS_FOR = all +endif +endif +ifeq ($(gb_PRODUCT),$(false)) gb_DEBUGLEVEL := 1 endif -ifneq ($(strip $(DBGLEVEL)$(dbglevel)),) +ifneq ($(strip $(DBGLEVEL)),) +gb_DEBUGLEVEL := $(strip $(DBGLEVEL)) +ifeq ($(origin DBGLEVEL),command line) +ENABLE_SYMBOLS_FOR = all +endif +endif ifneq ($(strip $(dbglevel)),) gb_DEBUGLEVEL := $(strip $(dbglevel)) -else -gb_DEBUGLEVEL := $(strip $(DBGLEVEL)) +ifeq ($(origin dbglevel),command line) +ENABLE_SYMBOLS_FOR = all endif endif |