Kaydet (Commit) 3f27da0a authored tarafından Michael Stahl's avatar Michael Stahl

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
üst 1fa1c73f
...@@ -30,7 +30,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,accessibility/bridge)) ...@@ -30,7 +30,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,accessibility/bridge))
$(call gb_CustomTarget_get_target,accessibility/bridge) : \ $(call gb_CustomTarget_get_target,accessibility/bridge) : \
$(call gb_CustomTarget_get_workdir,accessibility/bridge)/org/openoffice/java/accessibility/Build.java $(call gb_CustomTarget_get_workdir,accessibility/bridge)/org/openoffice/java/accessibility/Build.java
ifeq ($(PRODUCT),) ifeq ($(ENABLE_DBGUTIL),TRUE)
accessibility_DEBUG := true accessibility_DEBUG := true
accessibility_PRODUCT := false accessibility_PRODUCT := false
else else
......
...@@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) : ...@@ -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 WNT,$(OS)),LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \
$(if $(filter SOLARIS,$(OS)),LIBS="-lm") \ $(if $(filter SOLARIS,$(OS)),LIBS="-lm") \
$(if $(filter ANDROID,$(OS)),LIBS="-lgnustl_shared -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)" \ $(if $(debug),-g)" \
&& cd src \ && cd src \
&& $(MAKE) \ && $(MAKE) \
......
...@@ -34,7 +34,7 @@ $(eval $(call gb_WinResTarget_use_custom_headers,activex_res,\ ...@@ -34,7 +34,7 @@ $(eval $(call gb_WinResTarget_use_custom_headers,activex_res,\
extensions/source/activex/idl \ extensions/source/activex/idl \
)) ))
ifneq ($(PRODUCT),) ifneq ($(ENABLE_DBGUTIL),TRUE)
$(eval $(call gb_WinResTarget_add_defs,activex_res,\ $(eval $(call gb_WinResTarget_add_defs,activex_res,\
-DPRODUCT \ -DPRODUCT \
)) ))
......
...@@ -34,7 +34,7 @@ else ...@@ -34,7 +34,7 @@ else
$(call gb_ExternalProject_get_state_target,xmlsec,build) : $(call gb_ExternalProject_get_state_target,xmlsec,build) :
cd $(EXTERNAL_WORKDIR)/win32 \ cd $(EXTERNAL_WORKDIR)/win32 \
&& cscript configure.js crypto=mscrypto xslt=no iconv=no static=no \ && cscript configure.js crypto=mscrypto xslt=no iconv=no static=no \
$(if $(filter-out full,$(PRODUCT)),debug=yes) \ $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
&& unset MAKEFLAGS \ && unset MAKEFLAGS \
&& LIB="$(ILIB)" nmake \ && LIB="$(ILIB)" nmake \
&& touch $@ && touch $@
......
...@@ -23,7 +23,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \ ...@@ -23,7 +23,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \
$(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done:
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
ifeq ($(COM),MSC) ifeq ($(COM),MSC)
ifeq ($(PRODUCT),full) ifneq ($(ENABLE_DBGUTIL),TRUE)
$(PERL) $< -e $(SRCDIR)/postprocess/signing/no_signing.txt $(PERL) $< -e $(SRCDIR)/postprocess/signing/no_signing.txt
-l $(subst .done,_log.txt,$@) \ -l $(subst .done,_log.txt,$@) \
-f $(PFXFILE) \ -f $(PFXFILE) \
......
...@@ -198,7 +198,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\ ...@@ -198,7 +198,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/unx/util \ sal/osl/unx/util \
)) ))
$(eval $(call gb_Library_add_cobject,sal,sal/osl/unx/signal, \ $(eval $(call gb_Library_add_cobject,sal,sal/osl/unx/signal, \
$(if $(filter $(ENABLE_CRASHDUMP),YES)$(if $(PRODUCT),,TRUE), \ $(if $(filter $(ENABLE_CRASHDUMP),YES)$(filter $(ENABLE_DBGUTIL),TRUE), \
-DSAL_ENABLE_CRASH_REPORT) \ -DSAL_ENABLE_CRASH_REPORT) \
)) ))
......
...@@ -63,7 +63,7 @@ $(eval $(call gb_Library_use_system_win32_libs,ooofilt,\ ...@@ -63,7 +63,7 @@ $(eval $(call gb_Library_use_system_win32_libs,ooofilt,\
uuid \ uuid \
)) ))
ifneq ($(PRODUCT),full) ifeq ($(ENABLE_DBGUTIL),TRUE)
$(eval $(call gb_Library_use_system_win32_libs,ooofilt,\ $(eval $(call gb_Library_use_system_win32_libs,ooofilt,\
msvcrt \ msvcrt \
)) ))
......
...@@ -21,7 +21,7 @@ gb_CliLibraryTarget_CSCFLAGS_DEBUG := \ ...@@ -21,7 +21,7 @@ gb_CliLibraryTarget_CSCFLAGS_DEBUG := \
-define:TRACE \ -define:TRACE \
ifeq ($(strip $(debug)),) ifeq ($(strip $(debug)),)
ifeq ($(strip $(PRODUCT)),) ifeq ($(strip $(ENABLE_DBGUTIL)),TRUE)
gb_CliLibraryTarget__get_csflags = $(gb_CliLibraryTarget_CSCFLAGS) $(gb_CliLibraryTarget_CSCFLAGS_DEBUG) gb_CliLibraryTarget__get_csflags = $(gb_CliLibraryTarget_CSCFLAGS) $(gb_CliLibraryTarget_CSCFLAGS_DEBUG)
else else
gb_CliLibraryTarget__get_csflags = $(gb_CliLibraryTarget_CSCFLAGS) -o gb_CliLibraryTarget__get_csflags = $(gb_CliLibraryTarget_CSCFLAGS) -o
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment