From cce9a050031bec9d8bbbec3656d462eaea860c80 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 20 Dec 2010 11:38:26 -0600 Subject: [PATCH] fixing ::rtl::Reference/::uno::Reference collision, which broke PCH --- solenv/gbuild/LinkTarget.mk | 1 + solenv/gbuild/PrecompiledHeaders.mk | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 1b9a5e06f7eb..7f2609afcc35 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -553,6 +553,7 @@ ifeq ($(gb_FULLDEPS),$(true)) -include \ $(call gb_PrecompiledHeader_get_dep_target,$(3)) \ $(call gb_NoexPrecompiledHeader_get_dep_target,$(3)) +$(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(DEFS) -DPRECOMPILED_HEADERS $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS = $$(DEFS) endif diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk index f3e870ae89be..517d580afc1b 100644 --- a/solenv/gbuild/PrecompiledHeaders.mk +++ b/solenv/gbuild/PrecompiledHeaders.mk @@ -50,9 +50,15 @@ $(call gb_NoexPrecompiledHeader_get_dep_target,%) : echo '$(call gb_NoexPrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@) $(call gb_PrecompiledHeader_get_target,%) : + $(info pch def: $(PCH_DEFS)) + $(info pch cxx: $(PCH_CXXFLAGS) $(gb_PrecompiledHeader_EXCEPTIONFLAGS)) + $(info pch inc: $(INCLUDE_STL) $(INCLUDE)) $(call gb_PrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE)) $(call gb_NoexPrecompiledHeader_get_target,%) : + $(info pch def: $(PCH_DEFS)) + $(info pch cxx: $(PCH_CXXFLAGS) $(gb_PrecompiledHeader_EXCEPTIONFLAGS)) + $(info pch inc: $(INCLUDE_STL) $(INCLUDE)) $(call gb_NoexPrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE)) .PHONY : $(call gb_PrecompiledHeader_get_clean_target,%) $(call gb_NoExPrecompiledHeader_get_clean_target,%)