external/nss/ExternalProject_nss.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit c609f555e72cbf211e884b1b7798237ddf90a5f7 Author: Tor Lillqvist <[email protected]> AuthorDate: Mon Jan 19 06:44:07 2026 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Jan 19 08:20:21 2026 +0100 Move the CROSS_COMPILE, USE_X64, and CPU_ARCH to be make command line args Instead of passing them in the environment. Works better for cross-compilation at least from Linux to Linux. Change-Id: I46345f270fdcccd0a37370b63c1363281efc5607 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197539 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index cd198051c017..278f82ab5e9b 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -55,8 +55,6 @@ $(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 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)),\ MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \ @@ -65,9 +63,11 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ $(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \ $(if $(filter ARM,$(CPUNAME)),NSS_DISABLE_ARM32_NEON=1) \ NSPR_CONFIGURE_OPTS="$(gb_CONFIGURE_PLATFORMS)" \ - $(if $(CROSS_COMPILING),CROSS_COMPILE=1) \ NSDISTMODE=copy \ $(MAKE) \ + $(if $(CROSS_COMPILING),CROSS_COMPILE=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) \ AR="$(AR)" \ RANLIB="$(RANLIB)" \ NMEDIT="$(NM)edit" \
