diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-09-17 09:34:52 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-09-17 19:37:44 +0200 |
| commit | 5522d9aebe53952805ab24b8ffee30df439daa40 (patch) | |
| tree | 36648ac7f29c3f2736de03e63109320272c87bb5 /solenv/gbuild/Library.mk | |
| parent | b900b6ed25123cce890aa7ab4bdd59e35a6223a7 (diff) | |
do not copy invalid, merged libraries to instdir
Change-Id: I7f8e12530344e23e9bc68510795e90640ea8fd43
Diffstat (limited to 'solenv/gbuild/Library.mk')
| -rw-r--r-- | solenv/gbuild/Library.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 9064a082282c..2c2d5ca6fd2b 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -86,7 +86,7 @@ $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1))) -$(if $(call gb_Library_get_instdir,$(1)),\ +$(if $(and $(call gb_Library_get_instdir,$(1)),$(filter-out $(gb_MERGEDLIBS),$(1))),\ $(call gb_Library__install,$(call gb_Library__get_final_target,$(1)), \ $(call gb_Library_get_install_target,$(1)), \ $(gb_Library_DLLDIR)/$(call gb_Library_get_runtime_filename,$(1)), \ |