Author: truckman
Date: Sun Aug 28 05:41:36 2016
New Revision: 1758092
URL: http://svn.apache.org/viewvc?rev=1758092&view=rev
Log:
Follow up to r1758061. Only pass -DPRECOMPILED_HEADERS to the compiler
when the precompiled header is actually going to be used.
Modified:
openoffice/trunk/main/solenv/gbuild/LinkTarget.mk
openoffice/trunk/main/solenv/gbuild/platform/os2.mk
openoffice/trunk/main/solenv/gbuild/platform/windows.mk
openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk
Modified: openoffice/trunk/main/solenv/gbuild/LinkTarget.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/LinkTarget.mk?rev=1758092&r1=1758091&r2=1758092&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/LinkTarget.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/LinkTarget.mk Sun Aug 28 05:41:36 2016
@@ -717,14 +717,11 @@ $(call gb_LinkTarget_get_target,$(1)) :
$(call gb_LinkTarget_get_target,$(1)) : PCHOBJS = $(call
gb_PrecompiledHeader_get_target,$(3)).obj $(call
gb_NoexPrecompiledHeader_get_target,$(3)).obj
$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(DEFS) -DPRECOMPILED_HEADERS
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS = $$(DEFS)
ifeq ($(gb_FULLDEPS),$(true))
-include \
$(call gb_PrecompiledHeader_get_dep_target,$(3)) \
$(call gb_NoexPrecompiledHeader_get_dep_target,$(3))
-$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(DEFS)
-DPRECOMPILED_HEADERS
$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_NAME := $(3)
$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS = $$(DEFS)
endif
Modified: openoffice/trunk/main/solenv/gbuild/platform/os2.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/os2.mk?rev=1758092&r1=1758091&r2=1758092&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/os2.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/os2.mk Sun Aug 28 05:41:36 2016
@@ -201,7 +201,7 @@ endef
# PrecompiledHeader class
-gb_PrecompiledHeader_get_enableflags = -Yu$(1).hxx \
+gb_PrecompiledHeader_get_enableflags = -DPRECOMPILED_HEADERS -Yu$(1).hxx \
-Fp$(call gb_PrecompiledHeader_get_target,$(1))
ifeq ($(gb_FULLDEPS),$(true))
@@ -236,6 +236,7 @@ $(call gb_Helper_abbreviate_dirs_native,
-I$(dir $(3)) \
$(6) \
-c $(3) \
+ -DPRECOMPILED_HEADERS \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
$(call
gb_PrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
endef
@@ -277,6 +278,7 @@ $(call gb_Helper_abbreviate_dirs_native,
-I$(dir $(3)) \
$(6) \
-c $(3) \
+ -DPRECOMPILED_HEADERS \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
$(call
gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
endef
Modified: openoffice/trunk/main/solenv/gbuild/platform/windows.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/windows.mk?rev=1758092&r1=1758091&r2=1758092&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/windows.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/windows.mk Sun Aug 28 05:41:36
2016
@@ -309,7 +309,7 @@ endef
# PrecompiledHeader class
-gb_PrecompiledHeader_get_enableflags = -Yu$(1).hxx \
+gb_PrecompiledHeader_get_enableflags = -DPRECOMPILED_HEADERS -Yu$(1).hxx \
-Fp$(call gb_PrecompiledHeader_get_target,$(1))
ifeq ($(gb_FULLDEPS),$(true))
@@ -344,6 +344,7 @@ $(call gb_Helper_abbreviate_dirs_native,
-I$(dir $(3)) \
$(6) \
-c $(3) \
+ -DPRECOMPILED_HEADERS \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
$(call
gb_PrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
endef
@@ -385,6 +386,7 @@ $(call gb_Helper_abbreviate_dirs_native,
-I$(dir $(3)) \
$(6) \
-c $(3) \
+ -DPRECOMPILED_HEADERS \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
$(call
gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
endef
Modified: openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk?rev=1758092&r1=1758091&r2=1758092&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk Sun Aug 28
05:41:36 2016
@@ -312,6 +312,7 @@ $(call gb_Helper_abbreviate_dirs_native,
-x c++-header \
$(4) $(5) \
-I$(dir $(3)) \
+ -DPRECOMPILED_HEADERS \
$(6) \
-c $(3) \
-o$(1))
@@ -355,6 +356,7 @@ $(call gb_Helper_abbreviate_dirs_native,
-x c++-header \
$(4) $(5) \
-I$(dir $(3)) \
+ -DPRECOMPILED_HEADERS \
$(6) \
-c $(3) \
-o$(1))
