[Libreoffice-commits] core.git: solenv/gbuild

[Michael Stahl]

 solenv/gbuild/LinkTarget.mk |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit da2c3cf0aa78cb3363b3ded2bebc418d0cc7ffca
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sun Sep 22 17:13:04 2013 +0200

    gbuild: fix gb_LinkTarget_set_precompiled_header
    
    ... for --enable-selective-debuginfo, use the right argument for that.
    
    Change-Id: I34bc1f473e02d8f7038478afadc8de24780ae88a

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e05e62a..b40ad65 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