diff options
| author | Lubos Lunak <l.lunak@suse.cz> | 2012-10-19 12:49:36 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-10-22 14:56:19 +0200 |
| commit | 4e2e6bca852e9937ea001451a40734b6ee97d860 (patch) | |
| tree | 66198d52d4bbaf94d6c2888e347689a171691eb4 /solenv | |
| parent | clean up configure options for debugging build (diff) | |
| download | core-4e2e6bca852e9937ea001451a40734b6ee97d860.tar.gz core-4e2e6bca852e9937ea001451a40734b6ee97d860.zip | |
use (gb_)ENABLE_DBGUTIL rather than the confusing (gb_)PRODUCT
Using --enable-debug already makes the build a non-product build,
so this whole 'product' notion is rather confusing when reading
the build system code.
Change-Id: I4bb6b879a6bcd8c76c4b48ddaccb433ab8eb4bb2
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 19 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 2 |
4 files changed, 13 insertions, 12 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 2bd196847c24..521d4bd38e57 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -80,18 +80,19 @@ endif include $(GBUILDDIR)/Output.mk - -ifneq ($(strip $(PRODUCT)$(product)),) -gb_PRODUCT := $(true) -else -gb_PRODUCT := $(false) -endif - gb_TIMELOG := 0 ifneq ($(strip $(TIMELOG)$(timelog)),) gb_TIMELOG := 1 endif +# This used to be PRODUCT="" (for the same meaning as ENABLE_DBGUTIL="TRUE"), +# but the product meaning is now only confusing. +ifneq ($(ENABLE_DBGUTIL),) +gb_ENABLE_DBGUTIL := $(true) +else +gb_ENABLE_DBGUTIL := $(false) +endif + gb_DEBUGLEVEL := 0 ifneq ($(strip $(DEBUG)),) gb_DEBUGLEVEL := 1 @@ -106,7 +107,7 @@ ifeq ($(origin debug),command line) ENABLE_DEBUGINFO_FOR := all endif endif -ifeq ($(gb_PRODUCT),$(false)) +ifeq ($(gb_ENABLE_DBGUTIL),$(true)) gb_DEBUGLEVEL := 1 endif @@ -231,7 +232,7 @@ gb_GLOBALDEFS := \ $(gb_CPUDEFS) \ -ifeq ($(gb_PRODUCT),$(false)) +ifeq ($(gb_ENABLE_DBGUTIL),$(true)) gb_GLOBALDEFS += -DDBG_UTIL \ ifneq ($(COM),MSC) diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index a3d26722ef57..5845a60d021b 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -110,7 +110,7 @@ gb_LinkTarget_EXCEPTIONFLAGS := \ -DEXCEPTIONS_ON \ -fexceptions -ifeq ($(gb_PRODUCT),$(true)) +ifeq ($(gb_ENABLE_DBGUTIL),$(false)) # Clang doesn't have this option ifeq ($(HAVE_GCC_FNO_ENFORCE_EH_SPECS),TRUE) gb_LinkTarget_EXCEPTIONFLAGS += \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 18c94e207666..c7f24398c3bf 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -78,7 +78,7 @@ gb_CXXFLAGS := \ -Wno-non-virtual-dtor \ # enable debug STL -ifeq ($(gb_PRODUCT),$(false)) +ifeq ($(gb_ENABLE_DBGUTIL),$(true)) gb_COMPILERDEFS += \ -D_GLIBCXX_DEBUG \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index faf494aae047..f44951a78cba 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -83,7 +83,7 @@ gb_COMPILERDEFS += \ endif # enable debug STL -ifeq ($(gb_PRODUCT),$(false)) +ifeq ($(gb_ENABLE_DBGUTIL),$(true)) gb_COMPILERDEFS += \ -D_GLIBCXX_DEBUG \ |