From da2c3cf0aa78cb3363b3ded2bebc418d0cc7ffca Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Sun, 22 Sep 2013 17:13:04 +0200 Subject: gbuild: fix gb_LinkTarget_set_precompiled_header ... for --enable-selective-debuginfo, use the right argument for that. Change-Id: I34bc1f473e02d8f7038478afadc8de24780ae88a --- solenv/gbuild/LinkTarget.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'solenv') diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index e05e62a306c9..b40ad65c945a 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1350,7 +1350,7 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach sdi,$(2),$(call gb_SdiTa endef -# call gb_LinkTarget__set_precompiled_header_impl,linktarget,pchcxxfile,pchtarget +# call gb_LinkTarget__set_precompiled_header_impl,linktarget,pchcxxfile,pchtarget,linktargetmakefilename define gb_LinkTarget__set_precompiled_header_impl $(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_PrecompiledHeader_get_clean_target,$(3)) $(call gb_PrecompiledHeader_get_target,$(3)) : $(2).cxx @@ -1364,7 +1364,7 @@ $(call gb_LinkTarget_get_target,$(1)) : PCHOBJS = $$(PCHOBJEX) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $$(DEFS) $(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(T_CXXFLAGS) $(call gb_LinkTarget__get_cxxflags,$(1)) +$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(T_CXXFLAGS) $(call gb_LinkTarget__get_cxxflags,$(4)) $(call gb_PrecompiledHeader_get_target,$(3)) : VISIBILITY := @@ -1373,15 +1373,15 @@ $(call gb_PrecompiledHeader_get_timestamp,$(call gb_LinkTarget__get_workdir_link ifeq ($(gb_FULLDEPS),$(true)) -include $(call gb_PrecompiledHeader_get_dep_target,$(3)) $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $$(DEFS) -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $$(T_CXXFLAGS) $(call gb_LinkTarget__get_cxxflags,$(1)) +$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $$(T_CXXFLAGS) $(call gb_LinkTarget__get_cxxflags,$(4)) endif endef -# call gb_LinkTarget_set_precompiled_header,linktarget,pchcxxfile +# call gb_LinkTarget_set_precompiled_header,linktarget,pchcxxfile,linktargetmakefilename define gb_LinkTarget_set_precompiled_header ifeq ($(gb_ENABLE_PCH),$(true)) -$(call gb_LinkTarget__set_precompiled_header_impl,$(1),$(2),$(notdir $(2))) +$(call gb_LinkTarget__set_precompiled_header_impl,$(1),$(2),$(notdir $(2)),$(4)) endif endef -- cgit alue='distro/collabora/co-24.04'>distro/collabora/co-24.04 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/svl/source
AgeCommit message (Expand)Author
2013-12-10editeng: fix more 32-bit Time breakageMichael Stahl
2013-09-23fdo#54686 Treat hard blank as soft blank in numberLaurent Balland-Poirier
2013-08-13fdo#66071: SfxUndoManager: allow Writer to set modified status properlyMichael Stahl
2013-07-15i#108348 API CHANGE: add IsUTC to css.util.DateTime etc.Michael Stahl
2013-07-03SvStream: remove the error prone operator<</>>(sal_Int64)Michael Stahl
2013-06-15use proper offset for additional locale data formats, fdo#64947 relatedEike Rathke
2013-05-14unused svl/source/items/cstitem.src + hrc cleanupAndras Timar
2013-05-14Remove obsolete RestrictedPath env var supportStephan Bergmann
2013-05-14typo fix: s/inavlid/invalid/Andras Timar
2013-05-09fdo#63154: Remove _CL and _LF from solar.hMarcos Paulo de Souza
2013-05-07drop commented-out codeTakeshi Abe
2013-04-30i#120015# Let SdrUndoAttrObj remember a reference to the used style to surviveArmin Le Grand
2013-04-27Bin ugly (ab)use of preprocessor in headersTor Lillqvist
2013-04-26sal_Bool to boolTakeshi Abe