From 3f27da0a672d0eac84b2a7b411228bc667c4a2cf Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 3 Jan 2013 15:36:20 +0100 Subject: gbuild: replace all use of PRODUCT with ENABLE_DBGUTIL Also fix the wrong check in cppunit/ExternalProject_cppunit.mk which caused cppunit to always be built without -D_GLIBCXX_DEBUG. Change-Id: Ia247dcd84e2c6fa0e9384fd27643537984d980b5 --- cppunit/ExternalProject_cppunit.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cppunit') diff --git a/cppunit/ExternalProject_cppunit.mk b/cppunit/ExternalProject_cppunit.mk index 8a2d97c36288..b2f75e808fc0 100644 --- a/cppunit/ExternalProject_cppunit.mk +++ b/cppunit/ExternalProject_cppunit.mk @@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) : $(if $(filter WNT,$(OS)),LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \ $(if $(filter SOLARIS,$(OS)),LIBS="-lm") \ $(if $(filter ANDROID,$(OS)),LIBS="-lgnustl_shared -lm") \ - CXXFLAGS="$(if $(filter GCC,$(COM)),$(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(filter-out full,$(PRODUCT)),-D_GLIBCXX_DEBUG),$(if $(filter WNT,$(OS)),-mthreads))) \ + CXXFLAGS="$(if $(filter GCC,$(COM)),$(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(filter TRUE,$(ENABLE_DBGUTIL)),-D_GLIBCXX_DEBUG),$(if $(filter WNT,$(OS)),-mthreads))) \ $(if $(debug),-g)" \ && cd src \ && $(MAKE) \ -- cgit