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

5 files changed, 15 insertions, 14 deletions

diff --git a/configure.ac b/configure.ac
index 2ebeba9d968c..c5e3dacb7ea4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5016,7 +5016,7 @@ AC_SUBST(ALIGNOF_DOUBLE)
 dnl ===================================================================
 dnl Check if valgrind.h is available
 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
     dnl Test $prefix (currently only testing for /usr and /usr/local)
     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 -n "$enable_compiler_plugins"; then
         compiler_plugins="$enable_compiler_plugins"
-    elif test -n "$enable_dbgutil" -a "$enable_dbgutil" != "no"; then
+    elif test -n "$ENABLE_DBGUTIL"; then
         compiler_plugins=test
     else
         compiler_plugins=no
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 \