diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-15 19:10:19 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-15 19:16:33 +0100 |
| commit | 9dbc04dcb7ff1bdface91342194b77b841740d29 (patch) | |
| tree | e9f837132d6b2d7848b02d2ba216f0507f547d00 /solenv/gbuild/LinkTarget.mk | |
| parent | df31a0e3edc8dae5feaed48e8731fa4d7d440117 (diff) | |
LinkTarget: Avoid unnecessary library re-building in DISABLE_DYNLOADING case.
Change-Id: If469348f2385ef8009cf5a33f66f22d4a0e65070
Diffstat (limited to 'solenv/gbuild/LinkTarget.mk')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 9e0da07d67c9..e68d88879099 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -782,8 +782,10 @@ $(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS += $(3) # depend on the exports of the library, not on the library itself # for faster incremental builds when the ABI is unchanged +ifeq ($(DISABLE_DYNLOADING),) $(call gb_LinkTarget_get_target,$(1)) : \ $(foreach lib,$(3),$(call gb_Library_get_exports_target,$(lib))) +endif $(call gb_LinkTarget_get_headers_target,$(1)) : \ $(foreach lib,$(2),$(call gb_Library_get_headers_target,$(lib))) $(foreach lib,$(2),$(call gb_LinkTarget__lib_dummy_depend,$(lib))) @@ -862,7 +864,9 @@ endef define gb_LinkTarget_use_static_libraries $(call gb_LinkTarget_get_target,$(1)) : 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))) +endif $(call gb_LinkTarget_get_headers_target,$(1)) : \ $(foreach lib,$(2),$(call gb_StaticLibrary_get_headers_target,$(lib))) $(foreach lib,$(2),$(call gb_LinkTarget__static_lib_dummy_depend,$(lib))) |