diff options
| author | David Tardon <dtardon@redhat.com> | 2014-04-18 18:46:38 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-04-18 18:47:09 +0200 |
| commit | e43c823599afc02109faf8753be31cc8f496c096 (patch) | |
| tree | 10e8afb1d33be8ace35249502e9bcfa2c532bf59 /solenv | |
| parent | dbac8f5a075a8e39068d5e21ab63de224f818eca (diff) | |
do what i meant, not what i wrote
Change-Id: I266e9ba3fb72489986d7d8cef4cb59b8c09dd51f
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/ExternalExecutable.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/ExternalExecutable.mk b/solenv/gbuild/ExternalExecutable.mk index c1b3503a281b..7a0fd996dd53 100644 --- a/solenv/gbuild/ExternalExecutable.mk +++ b/solenv/gbuild/ExternalExecutable.mk @@ -115,7 +115,7 @@ define gb_ExternalExecutable__set_internal $(if $(3),,$(if $(filter $(WORKDIR_FOR_BUILD)/UnpackedTarball,$(2)),\ $(call gb_Output_error,depending directly on executable $(2) from UnpackedTarball is not allowed. Use the UnpackedTarball target as dependency.))) gb_ExternalExecutable_$(1)_EXECUTABLE := $(2) -gb_ExternalExecutable_$(1)_DEPENDENCIES := $(if $(3),$(3),$(2)) +gb_ExternalExecutable_$(1)_DEPENDENCIES := $(if $(3),$(call gb_Executable_get_target_for_build,$(3)),$(2)) gb_ExternalExecutable_$(1)_PRECOMMAND := $(subst $$,$$$$,$(gb_Helper_set_ld_path)) $(BUILDTOOLTRACE) endef @@ -131,7 +131,7 @@ endef # # gb_ExternalExecutable_set_internal executable call? external? define gb_ExternalExecutable_set_internal -$(call gb_ExternalExecutable__set_internal,$(1),$(if $(strip $(2)),$(2),$(gb_Executable_BINDIR_FOR_BUILD)/$(1)$(gb_Executable_EXT_for_build)),$(call gb_ExternalProject_get_target_for_build,$(strip $(3)))) +$(call gb_ExternalExecutable__set_internal,$(1),$(if $(strip $(2)),$(2),$(gb_Executable_BINDIR_FOR_BUILD)/$(1)$(gb_Executable_EXT_for_build)),$(strip $(3))) endef |