strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing ::rtl::Reference/::uno::Reference collision, which broke PCH

Browse source
This commit is contained in:
Norbert Thiebaud 2010-12-20 11:38:26 -06:00
parent 9708c32c6f
commit cce9a05003
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
solenv/gbuild/LinkTarget.mk
View file

@ -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

6
solenv/gbuild/PrecompiledHeaders.mk
View file

@ -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,%)