diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2016-11-25 02:35:05 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2016-11-25 08:54:28 +0000 |
| commit | 93399570a840f015358fec48060d507e7f2aa369 (patch) | |
| tree | 99f3457d78831d131ca539d3a467bbdf6639c89a /solenv | |
| parent | 8b511fa1fbc63c449de95b3b4de05298a5944312 (diff) | |
fix around cornercases with cxxobjects
Change-Id: Ibd5dad8ca69fa952e4751af961ad957017fbbe40
Reviewed-on: https://gerrit.libreoffice.org/31181
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/post_GbuildToJson.mk | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk index 392ff1e99a0c..0740cf7f0b58 100644 --- a/solenv/gbuild/extensions/post_GbuildToJson.mk +++ b/solenv/gbuild/extensions/post_GbuildToJson.mk @@ -83,6 +83,15 @@ gb_LinkTarget_set_nativeres = gb_LinkTarget_add_nativeres = gb_Library_set_componentfile = gb_LinkTarget_use_restarget = +# TODO: curious these are needed in addition +gb_Executable_add_cxxobject = $(call gb_Executable_get_target,$(1)): CXXOBJECTS += $(2) +gb_Executable_add_cxxobjects = $(call gb_Executable_get_target,$(1)): CXXOBJECTS += $(2) +gb_Executable_add_exception_object = $(call gb_Executable_get_target,$(1)): CXXOBJECTS += $(2) +gb_Executable_add_exception_objects = $(call gb_Executable_get_target,$(1)): CXXOBJECTS += $(2) +gb_Library_add_cxxobject = $(call gb_Library_get_target,$(1)): CXXOBJECTS += $(2) +gb_Library_add_cxxobjects = $(call gb_Library_get_target,$(1)): CXXOBJECTS += $(2) +gb_Library_add_exception_object = $(call gb_Library_get_target,$(1)): CXXOBJECTS += $(2) +gb_Library_add_exception_objects = $(call gb_Library_get_target,$(1)): CXXOBJECTS += $(2) #$(call gb_Library_get_exports_target,%): |