diff options
| author | David Tardon <dtardon@redhat.com> | 2012-12-29 10:00:49 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-12-29 13:06:49 +0100 |
| commit | 11a9ce33f74e28ecfd3db358a1e77856b36cfc38 (patch) | |
| tree | ba0561310ce78df8fccde474756fc78966a49aab /RepositoryExternal.mk | |
| parent | 43a3f734f9df07bbd11cad3e9418814b37be058c (diff) | |
rethink external executable setup
Change-Id: I5293fea9b5404b82e72761407d325c408a2e45ca
(cherry picked from commit bbf2f413958e7be2bef34c62932fc76f83e7ed18)
Signed-off-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index fc307e30d191..97b661a564b3 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2410,7 +2410,7 @@ gb_ExternalExecutable__register_xmllint := else # ! SYSTEM_LIBXML_FOR_BUILD define gb_ExternalExecutable__register_xmllint -gb_ExternalExecutable__xmllint_TARGET := $(call gb_Executable_get_target_for_build,xmllint) +$(call gb_ExternalExecutable_set_internal,xmllint) endef @@ -2423,7 +2423,7 @@ gb_ExternalExecutable__register_xsltproc := else # ! SYSTEM_LIBXSLT_FOR_BUILD define gb_ExternalExecutable__register_xsltproc -gb_ExternalExecutable__xsltproc_TARGET := $(call gb_Executable_get_target_for_build,xsltproc) +$(call gb_ExternalExecutable_set_internal,xsltproc) endef @@ -2436,7 +2436,7 @@ gb_ExternalExecutable__register_ucpp := else # ! SYSTEM_UCPP define gb_ExternalExecutable__register_ucpp -gb_ExternalExecutable__ucpp_TARGET := $(call gb_Executable_get_target_for_build,ucpp) +$(call gb_ExternalExecutable_set_internal,ucpp) endef @@ -2446,7 +2446,7 @@ endif # SYSTEM_UCPP ifeq ($(SYSTEM_PYTHON),YES) define gb_ExternalExecutable__register_python -gb_ExternalExecutable__python_COMMAND := $(ICECREAM_RUN) $(PYTHON) +$(call gb_ExternalExecutable_set_external,python,$(PYTHON)) endef @@ -2456,7 +2456,7 @@ else ifeq ($(OS),MACOSX) #gbuild/platform/macosx.mk correctly for mac, e.g. PYTHONPATH and PYTHONHOME #dirs for in-tree internal python define gb_ExternalExecutable__register_python -gb_ExternalExecutable__python_COMMAND := $(ICECREAM_RUN) $(PYTHON) +$(call gb_ExternalExecutable_set_external,python,$(PYTHON)) endef @@ -2469,11 +2469,11 @@ else # ! SYSTEM_PYTHON # internal python define gb_ExternalExecutable__register_python -gb_ExternalExecutable__python_TARGET := $(call gb_Executable_get_target_for_build,python) -gb_ExternalExecutable__python_PRECOMMAND := $(gb_PYTHON_PRECOMMAND) -gb_ExternalExecutable__python_DEPS := \ - $(call gb_Executable_get_target_for_build,python) \ - $(call gb_Package_get_target,python3) +$(call gb_ExternalExecutable_set_internal,python) +$(call gb_ExternalExecutable_set_precommand,python,$(gb_PYTHON_PRECOMMAND)) +$(call gb_ExternalExecutable_add_dependencies,python,\ + $(call gb_Package_get_target,python3) \ +) endef |