diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-22 18:47:56 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-22 22:30:20 +0200 |
| commit | e6c47b03d06d2e0c4b924baaf00d9a2412dc40e2 (patch) | |
| tree | cd2dc498a41ab663a23fb77fca6beb54a137e31b /solenv | |
| parent | c03ff5ebc0f008825e45285f7c4021329bd60c05 (diff) | |
libxml2, libxslt: use executables from WORKDIR
Change-Id: I1324c8f21e31c69b9780136cc777e1aea3bc546e
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/ExternalExecutable.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/gbuild/ExternalExecutable.mk b/solenv/gbuild/ExternalExecutable.mk index 0d2a8cc13ce7..770dd3a772e3 100644 --- a/solenv/gbuild/ExternalExecutable.mk +++ b/solenv/gbuild/ExternalExecutable.mk @@ -111,9 +111,10 @@ endef # FIXME need to subst in some more $$ in gb_Helper_set_ld_path here - ugly # but other uses (gb_CppunitTest_CPPTESTPRECOMMAND) require less $$ - ugly +# FIXME hack to avoid dependency into workdir - those must be added explicitly define gb_ExternalExecutable__set_internal gb_ExternalExecutable_$(1)_EXECUTABLE := $(2) -gb_ExternalExecutable_$(1)_DEPENDENCIES := $(2) +gb_ExternalExecutable_$(1)_DEPENDENCIES := $(if $(findstring $(WORKDIR_FOR_BUILD),$(2)),,$(2)) gb_ExternalExecutable_$(1)_PRECOMMAND := $(subst $$,$$$$,$(gb_Helper_set_ld_path)) endef |