diff options
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 b9173ea74645..13258b8c3438 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -106,7 +106,7 @@ endef # gb_Library__get_final_target has been invented for that purpose... define gb_Library_set_componentfile $(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Library__get_componentprefix,$(1)),\ - $(call gb_Library_get_runtime_filename,$(if $(MERGELIBS),$(if $(filter $(gb_MERGED_LIBS),$(1)),merged,$(1)),$(1)))) + $(call gb_Library_get_runtime_filename,$(if $(filter $(1),$(gb_MERGEDLIBS)),merged,$(1)))) $(call gb_Library__get_final_target,$(1)) : \ $(call gb_ComponentTarget_get_outdir_target,$(2)) $(call gb_ComponentTarget_get_target,$(2)) :| $(call gb_Library_get_target,$(1)) |