diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-06-07 17:27:21 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-06-07 18:20:08 +0200 |
| commit | 3e70e26cbc96667e2968cd325737053bf8bffb78 (patch) | |
| tree | 5dd7f1d39ae701cd51867fb1ea706c4d54c18434 /solenv | |
| parent | c76974576aa5eec6b86af39eaaadc8e382f214bd (diff) | |
gbuild: fix over-evaluation in gb_ExternalExecutable__set_internal
We lose the path setting here, with this crude hack it appears to work.
Change-Id: I241d7e6ec7a148a27e31d73b8e5ddb62f0a948d6
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/ExternalExecutable.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/solenv/gbuild/ExternalExecutable.mk b/solenv/gbuild/ExternalExecutable.mk index d29a4fe5f504..c87ea26c5a6f 100644 --- a/solenv/gbuild/ExternalExecutable.mk +++ b/solenv/gbuild/ExternalExecutable.mk @@ -109,10 +109,12 @@ $(if $(2),gb_ExternalExecutable_$(1)_EXECUTABLE := $(2)) 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 define gb_ExternalExecutable__set_internal gb_ExternalExecutable_$(1)_EXECUTABLE := $(2) gb_ExternalExecutable_$(1)_DEPENDENCIES := $(2) -gb_ExternalExecutable_$(1)_PRECOMMAND := $(gb_Helper_set_ld_path) +gb_ExternalExecutable_$(1)_PRECOMMAND := $(subst $$,$$$$,$(gb_Helper_set_ld_path)) endef |