diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-12-15 14:37:44 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-12-15 14:48:02 +0100 |
| commit | 8cc1e7a7c3ec897129cc6318b254e8dafc682435 (patch) | |
| tree | ee53cf8bf7cd5e38206c57199373089f93e6147a /solenv/gbuild/LinkTarget.mk | |
| parent | b6be3d3db3ffbc4c1a4528a8dc17aa95084e12ca (diff) | |
gbuild: More automagic for libmerged
Only gb_Library_use_libraries stays because I think it's a good idea to see
dependent libraries (potential candidates for merging) and hopefully the
list does not change often anyway.
This commit extends b6be3d3db3ffbc4c1a4528a8dc17aa95084e12ca
Change-Id: I2682456f53cb2e8d7ea63eae15f8979a3c828401
Diffstat (limited to 'solenv/gbuild/LinkTarget.mk')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index e59b425c9dea..948f65676a86 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -713,6 +713,8 @@ endef # call gb_LinkTarget_add_libs,linktarget,libs define gb_LinkTarget_add_libs $(call gb_LinkTarget_get_target,$(1)) : T_LIBS += $(2) +$(if $(call gb_LinkTarget__is_merged,$(1)),\ + $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,merged)) : T_LIBS += $(2)) endef @@ -893,6 +895,9 @@ endef # call gb_LinkTarget_use_static_libraries,linktarget,staticlibs define gb_LinkTarget_use_static_libraries $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $$(if $$(filter-out StaticLibrary,$$(TARGETTYPE)),$(2)) +$(if $(call gb_LinkTarget__is_merged,$(1)),\ + $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,merged)) : \ + LINKED_STATIC_LIBS += $$(if $$(filter-out StaticLibrary,$$(TARGETTYPE)),$(2))) ifeq ($(DISABLE_DYNLOADING),) $(call gb_LinkTarget_get_target,$(1)) : $(foreach lib,$(2),$(call gb_StaticLibrary_get_target,$(lib))) |