diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-03-05 22:03:38 +0100 |
|---|---|---|
| committer | David Ostrovsky <David.Ostrovsky@gmx.de> | 2013-03-12 08:10:49 +0000 |
| commit | e482672b5893cfd307d09a993fa83cb9be9aacb7 (patch) | |
| tree | 4d6b0e371f864794906e91c4c3d4a6dd20d88dd2 /RepositoryExternal.mk | |
| parent | 5a2cfa677356f77cda15365dd9107ce503e11dd4 (diff) | |
use system python for building if possible
Also simplifies configure, hopefully without any mistake;)
Change-Id: I5c6c53fbee06cd1ecccf878a5c080274bfd950c1
Reviewed-on: https://gerrit.libreoffice.org/2563
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2e36e94e4881..06edb7d69552 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2754,33 +2754,9 @@ endef endif # SYSTEM_UCPP -# TODO what do do with gb_PYTHON_PRECOMMAND? Move here? -ifeq ($(SYSTEM_PYTHON),YES) +ifeq (,$(PYTHON_FOR_BUILD)) define gb_ExternalExecutable__register_python -$(call gb_ExternalExecutable_set_external,python,$(PYTHON)) - -endef - -else ifeq ($(OS),MACOSX) - -#fixme: remove this MACOSX ifeq branch by filling in gb_PYTHON_PRECOMMAND in -#gbuild/platform/macosx.mk correctly for mac, e.g. PYTHONPATH and PYTHONHOME -#dirs for in-tree internal python -define gb_ExternalExecutable__register_python -$(call gb_ExternalExecutable_set_external,python,$(PYTHON)) - -endef - -else ifeq ($(DISABLE_PYTHON),TRUE) - -# Build-time python -gb_ExternalExecutable__register_python := - -else # ! SYSTEM_PYTHON - -# internal python -define gb_ExternalExecutable__register_python $(call gb_ExternalExecutable_set_internal,python) $(call gb_ExternalExecutable_set_precommand,python,$(gb_PYTHON_PRECOMMAND)) $(call gb_ExternalExecutable_add_dependencies,python,\ @@ -2792,7 +2768,14 @@ $(call gb_ExternalExecutable_add_dependencies,python,\ endef -endif # SYSTEM_PYTHON +else + +define gb_ExternalExecutable__register_python +$(call gb_ExternalExecutable_set_external,python,$(PYTHON_FOR_BUILD)) + +endef + +endif # PYTHON_FOR_BUILD ifneq ($(SYSTEM_GENBRK),) |