diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2016-02-22 21:29:05 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2016-02-23 07:21:30 +0000 |
| commit | 761053abd83155d5333e098bfa114624437ae553 (patch) | |
| tree | 401d12eee09f9c6926caaadafc1efb1146720807 /external/python3/ExternalPackage_python3.mk | |
| parent | 04146e07e073ec398eec7869e1571cb65f9926ea (diff) | |
Fix python packaging on MSVC 14.0, 32bit
Change-Id: I5604aa21981c216e992cbefae043acfd0ab07bbd
Reviewed-on: https://gerrit.libreoffice.org/22626
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'external/python3/ExternalPackage_python3.mk')
| -rw-r--r-- | external/python3/ExternalPackage_python3.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk index 4f03524e5fa2..07a875ccf973 100644 --- a/external/python3/ExternalPackage_python3.mk +++ b/external/python3/ExternalPackage_python3.mk @@ -14,6 +14,8 @@ $(eval $(call gb_ExternalPackage_use_external_project,python3,python3)) ifeq ($(OS)-$(COM),WNT-MSC) ifeq ($(CPUNAME),X86_64) python_arch_subdir=amd64/ +else +python_arch_subdir=win32/ endif $(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/bin/python.exe,PCbuild/$(python_arch_subdir)python$(if $(MSVC_USE_DEBUG_RUNTIME),_d).exe)) $(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll,PCbuild/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll)) |