diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-07-18 03:57:20 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-09-17 06:39:06 +0200 |
| commit | bd066a17a22826ceb10e7763074704289f838f74 (patch) | |
| tree | 500152beed684c2ab8dea9bac61744f165d757d8 /RepositoryExternal.mk | |
| parent | dab9f9afe214fd5c5803e880c0e3d69f6fad3b14 (diff) | |
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@fbihome.de>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 9 |
1 files changed, 8 insertions, 1 deletions
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),\ |