summaryrefslogtreecommitdiff
path: root/solenv/gbuild/ComponentTarget.mk
diff options
context:
space:
mode:
authorBjoern Michaelsen <b_michaelsen@openoffice.org>2010-11-19 21:30:38 +0100
committerBjoern Michaelsen <b_michaelsen@openoffice.org>2010-11-19 21:30:38 +0100
commit97912c6f72e8cfdf32edee857b4c2d36f8cfee89 (patch)
treeb04b1c382c3dc74a9f01015e7d348fcbc777303f /solenv/gbuild/ComponentTarget.mk
parent767538bd266c6d620b9664ff1eb5641381b14440 (diff)
gnumake2: fixes for linking on OSX
Diffstat (limited to 'solenv/gbuild/ComponentTarget.mk')
-rwxr-xr-xsolenv/gbuild/ComponentTarget.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 1e8db6ce7996..15d162ee29c3 100755
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -68,7 +68,7 @@ $(call gb_ComponentTarget_get_external_target,%) :
$(call gb_Deliver_deliver,$<,$@)
define gb_ComponentTarget_ComponentTarget
-$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(firstword $(3) $(2))
+$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(or $(3),$(2))
$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1))
$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)))