[Libreoffice-commits] core.git: external/python3 RepositoryExternal.mk

[Jan-Marek Glogowski (via logerrit)]

 RepositoryExternal.mk                       |    9 ++++++++-
 external/python3/ExternalPackage_python3.mk |    3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit bd066a17a22826ceb10e7763074704289f838f74
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Sat Jul 18 03:57:20 2020 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Thu Sep 17 06:39:06 2020 +0200

    python3: fix Windows Arm64 build
    
    Change-Id: I2e9f9ca5fcf40a3ff53c036ebc51a75b882d91f3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102854
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d396cc5b5190..1a4acbb80437 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3183,8 +3183,15 @@ $(call gb_LinkTarget_use_package,$(1),python3)
 endif
 
 ifeq ($(OS),WNT)
+ifeq ($(CPUNAME),X86_64)
+python_arch_subdir=amd64
+else ifeq ($(CPUNAME),ARM64)
+python_arch_subdir=arm64
+else
+python_arch_subdir=win32
+endif
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,python3)/PCbuild/$(if $(filter X86_64,$(CPUNAME)),amd64,win32)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
+	$(call gb_UnpackedTarball_get_dir,python3)/PCbuild/$(python_arch_subdir)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \
 )
 else ifeq ($(OS),MACOSX)
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk
index 692b2793bd37..4886b123cab4 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -14,9 +14,12 @@ $(eval $(call gb_ExternalPackage_use_external_project,python3,python3))
 ifeq ($(OS),WNT)
 ifeq ($(CPUNAME),X86_64)
 python_arch_subdir=amd64/
+else ifeq ($(CPUNAME),ARM64)
+python_arch_subdir=arm64/
 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))
 ifeq ($(MSVC_USE_DEBUG_RUNTIME),)