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

[Luboš Luňák (via logerrit)]

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

New commits:
commit 287df6cf083a8ebeea8d64108a9e6d74cd834319
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Sat Apr 6 22:52:00 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Sun Apr 7 14:55:09 2019 +0200

    pass all arguments to gb_LinkTarget_add_cxxobject properly
    
    Change-Id: Ie7469f32f08c7acf5a972dec12fa75604aa8336d
    Reviewed-on: https://gerrit.libreoffice.org/70368
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 0c79c73fcb46..3292c26bcde2 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1325,7 +1325,7 @@ endef
 
 # call gb_LinkTarget_add_exception_object,linktarget,sourcefile,linktargetmakefilename
 define gb_LinkTarget_add_exception_object
-$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(call gb_LinkTarget__get_cxxflags,$(3)))
+$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(call gb_LinkTarget__get_cxxflags,$(3)),$(3))
 endef
 
 # call gb_LinkTarget__use_linktarget_objects,linktarget,linktargets
@@ -1362,7 +1362,7 @@ endef
 
 # call gb_LinkTarget_add_cxxobjects,linktarget,sourcefiles,cxxflags,linktargetmakefilename
 define gb_LinkTarget_add_cxxobjects
-$(foreach obj,$(2),$(call gb_LinkTarget_add_cxxobject,$(1),$(obj),$(3)))
+$(foreach obj,$(2),$(call gb_LinkTarget_add_cxxobject,$(1),$(obj),$(3),$(4)))
 endef
 
 # call gb_LinkTarget_add_objcobjects,linktarget,sourcefiles,objcflags,linktargetmakefilename