diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-02-23 08:51:28 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-02-23 10:17:22 +0100 |
| commit | c7a920a9b742ee273f3e7a8583d11eaeebf4fe1d (patch) | |
| tree | b93e510863dff57b3df2f657d2c32a1f559eebef /RepositoryExternal.mk | |
| parent | 19b7f715543bdb55293f5d729fcefbcf2f701efe (diff) | |
Sync the two definitions of python_arch_subdir
...in RepositoryExternal.mk and external/python3/ExternalPackage_python3.mk.
The variance in trailing slash had caused
<https://gerrit.libreoffice.org/c/core/+/130355> "external/python3: Explicitly
check that all extension modules got built" to fail on Windows at
<https://ci.libreoffice.org/job/gerrit_windows/120651/> with
> Error: missing PCbuild/win32_asyncio_d.pyd
> make[1]: *** [C:/cygwin64/home/tdf/lode/jenkins/workspace/gerrit_windows/external/python3/ExternalProject_python3.mk:37: C:/cygwin64/home/tdf/lode/jenkins/workspace/gerrit_windows/workdir/ExternalProject/python3/build] Error 1
(and note the missing slash in "PCbuild/win32_asyncio_d.pyd").
(Ideally, these two definitions would be consolidated anyway, but that's left
for later.)
Change-Id: If2e6081e966bf3931eb0092616705521b4cfd3ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130410
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index f63c95c142ea..b51660e182cb 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3164,14 +3164,14 @@ endif ifeq ($(OS),WNT) ifeq ($(CPUNAME),X86_64) -python_arch_subdir=amd64 +python_arch_subdir=amd64/ else ifeq ($(CPUNAME),AARCH64) -python_arch_subdir=arm64 +python_arch_subdir=arm64/ else -python_arch_subdir=win32 +python_arch_subdir=win32/ endif $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,python3)/PCbuild/$(python_arch_subdir)/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),\ |