external/nss/ExternalProject_nss.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
New commits: commit d5071c1e46da4d85085e423d104a11dbbf485d5d Author: Christian Lohmaier <[email protected]> AuthorDate: Thu Dec 11 10:57:57 2025 +0100 Commit: Christian Lohmaier <[email protected]> CommitDate: Fri Dec 12 01:23:06 2025 +0100 fix nss/nspr build on intel macs regression from aba5f8016965e42075e68faa17ddfd3b3213247d nss' Darwin.mk uses uname -p to decide on the platform if CPU_ARCH is not set, and that still returns i386 on intel macs – in the old version that still worked since there was an additional ifdef USE_64 check that then set it to x86_64, but that has since been removed and only the custom guards to not add additional -arch parameter to the compiler flags remain, resulting in the built to attempt a 32bit and that then fails when it comes to the assembly instructions: mpi/mpi_sse2.s:35:5: error: instruction requires: Not 64-bit mode push %ebp ^ mpi/mpi_sse2.s:37:5: error: instruction requires: Not 64-bit mode push %edi ^ mpi/mpi_sse2.s:38:5: error: instruction requires: Not 64-bit mode push %esi ^ […] So don't rely on auto-detection and specify it explicitly as it was done for the other variants already, ironically also already for building for intel on arm. But the additional check whether it is building on arm is not necessary, our CPUNAME is sufficient already and that now superfluous bit can be removed. Change-Id: Ic467b06beb9b73e2d177eedede886681aa668b15 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195439 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> Reviewed-by: Dan Williams <[email protected]> (cherry picked from commit e11962c57a1a955f1509a653deea352583f3f77e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195490 Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 3a9715862abe..cd198051c017 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -55,7 +55,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ $(SRCDIR)/external/nss/nsinstall.py $(call gb_Trace_StartRange,nss,EXTERNAL) $(call gb_ExternalProject_run,build,\ - $(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \ + $(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1 CPU_ARCH=x86_64)) \ $(if $(filter AARCH64,$(CPUNAME)),USE_64=1 CPU_ARCH=aarch64) \ $(if $(filter POWERPC64,$(CPUNAME)),USE_64=1 CPU_ARCH=ppc64le) \ $(if $(filter MACOSX,$(OS)),\ @@ -66,8 +66,6 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ $(if $(filter ARM,$(CPUNAME)),NSS_DISABLE_ARM32_NEON=1) \ NSPR_CONFIGURE_OPTS="$(gb_CONFIGURE_PLATFORMS)" \ $(if $(CROSS_COMPILING),CROSS_COMPILE=1) \ - $(if $(filter MACOSX-X86_64-arm64,$(OS)-$(CPUNAME)-$(shell uname -m)), \ - CPU_ARCH=x86_64) \ NSDISTMODE=copy \ $(MAKE) \ AR="$(AR)" \
