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
This commit is contained in:
@@ -5016,7 +5016,7 @@ AC_SUBST(ALIGNOF_DOUBLE)
|
|||||||
dnl ===================================================================
|
dnl ===================================================================
|
||||||
dnl Check if valgrind.h is available
|
dnl Check if valgrind.h is available
|
||||||
dnl ===================================================================
|
dnl ===================================================================
|
||||||
if test "$cross_compiling" != "yes" -a "$enable_dbgutil" != "no" -a \
|
if test "$cross_compiling" != "yes" -a -n "$ENABLE_DBGUTIL" -a \
|
||||||
-z "$VALGRIND_CFLAGS"; then
|
-z "$VALGRIND_CFLAGS"; then
|
||||||
dnl Test $prefix (currently only testing for /usr and /usr/local)
|
dnl Test $prefix (currently only testing for /usr and /usr/local)
|
||||||
dnl so that VALGRIND_CFLAGS = -I$prefix/include/valgrind
|
dnl so that VALGRIND_CFLAGS = -I$prefix/include/valgrind
|
||||||
@@ -5044,7 +5044,7 @@ COMPILER_PLUGINS=
|
|||||||
if test "$COM_GCC_IS_CLANG" = "TRUE"; then
|
if test "$COM_GCC_IS_CLANG" = "TRUE"; then
|
||||||
if test -n "$enable_compiler_plugins"; then
|
if test -n "$enable_compiler_plugins"; then
|
||||||
compiler_plugins="$enable_compiler_plugins"
|
compiler_plugins="$enable_compiler_plugins"
|
||||||
elif test -n "$enable_dbgutil" -a "$enable_dbgutil" != "no"; then
|
elif test -n "$ENABLE_DBGUTIL"; then
|
||||||
compiler_plugins=test
|
compiler_plugins=test
|
||||||
else
|
else
|
||||||
compiler_plugins=no
|
compiler_plugins=no
|
||||||
|
@@ -80,18 +80,19 @@ endif
|
|||||||
|
|
||||||
include $(GBUILDDIR)/Output.mk
|
include $(GBUILDDIR)/Output.mk
|
||||||
|
|
||||||
|
|
||||||
ifneq ($(strip $(PRODUCT)$(product)),)
|
|
||||||
gb_PRODUCT := $(true)
|
|
||||||
else
|
|
||||||
gb_PRODUCT := $(false)
|
|
||||||
endif
|
|
||||||
|
|
||||||
gb_TIMELOG := 0
|
gb_TIMELOG := 0
|
||||||
ifneq ($(strip $(TIMELOG)$(timelog)),)
|
ifneq ($(strip $(TIMELOG)$(timelog)),)
|
||||||
gb_TIMELOG := 1
|
gb_TIMELOG := 1
|
||||||
endif
|
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
|
gb_DEBUGLEVEL := 0
|
||||||
ifneq ($(strip $(DEBUG)),)
|
ifneq ($(strip $(DEBUG)),)
|
||||||
gb_DEBUGLEVEL := 1
|
gb_DEBUGLEVEL := 1
|
||||||
@@ -106,7 +107,7 @@ ifeq ($(origin debug),command line)
|
|||||||
ENABLE_DEBUGINFO_FOR := all
|
ENABLE_DEBUGINFO_FOR := all
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(gb_PRODUCT),$(false))
|
ifeq ($(gb_ENABLE_DBGUTIL),$(true))
|
||||||
gb_DEBUGLEVEL := 1
|
gb_DEBUGLEVEL := 1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -231,7 +232,7 @@ gb_GLOBALDEFS := \
|
|||||||
$(gb_CPUDEFS) \
|
$(gb_CPUDEFS) \
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(gb_PRODUCT),$(false))
|
ifeq ($(gb_ENABLE_DBGUTIL),$(true))
|
||||||
gb_GLOBALDEFS += -DDBG_UTIL \
|
gb_GLOBALDEFS += -DDBG_UTIL \
|
||||||
|
|
||||||
ifneq ($(COM),MSC)
|
ifneq ($(COM),MSC)
|
||||||
|
@@ -110,7 +110,7 @@ gb_LinkTarget_EXCEPTIONFLAGS := \
|
|||||||
-DEXCEPTIONS_ON \
|
-DEXCEPTIONS_ON \
|
||||||
-fexceptions
|
-fexceptions
|
||||||
|
|
||||||
ifeq ($(gb_PRODUCT),$(true))
|
ifeq ($(gb_ENABLE_DBGUTIL),$(false))
|
||||||
# Clang doesn't have this option
|
# Clang doesn't have this option
|
||||||
ifeq ($(HAVE_GCC_FNO_ENFORCE_EH_SPECS),TRUE)
|
ifeq ($(HAVE_GCC_FNO_ENFORCE_EH_SPECS),TRUE)
|
||||||
gb_LinkTarget_EXCEPTIONFLAGS += \
|
gb_LinkTarget_EXCEPTIONFLAGS += \
|
||||||
|
@@ -78,7 +78,7 @@ gb_CXXFLAGS := \
|
|||||||
-Wno-non-virtual-dtor \
|
-Wno-non-virtual-dtor \
|
||||||
|
|
||||||
# enable debug STL
|
# enable debug STL
|
||||||
ifeq ($(gb_PRODUCT),$(false))
|
ifeq ($(gb_ENABLE_DBGUTIL),$(true))
|
||||||
gb_COMPILERDEFS += \
|
gb_COMPILERDEFS += \
|
||||||
-D_GLIBCXX_DEBUG \
|
-D_GLIBCXX_DEBUG \
|
||||||
|
|
||||||
|
@@ -83,7 +83,7 @@ gb_COMPILERDEFS += \
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# enable debug STL
|
# enable debug STL
|
||||||
ifeq ($(gb_PRODUCT),$(false))
|
ifeq ($(gb_ENABLE_DBGUTIL),$(true))
|
||||||
gb_COMPILERDEFS += \
|
gb_COMPILERDEFS += \
|
||||||
-D_GLIBCXX_DEBUG \
|
-D_GLIBCXX_DEBUG \
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user