diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-10-19 20:52:46 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-11-15 10:45:05 +0100 |
| commit | 2436a368460c26bc2b47742966ed152c46eedba8 (patch) | |
| tree | c0cf58811f0cb6e0fd89e1bf7a02b52485f0e04b /external | |
| parent | 8f6ed6d4bd3d37bba02b540d0da917cfb4380d03 (diff) | |
Unbreak nss build for the native arm64 on an Apple Silicon Mac
I had managed to break it with 92b99bddb63b1bf4a639fc969727ac35b3ed1ac8
that made it possible to build for (Rosettafied) x86_64 on an Apple
Silicon Mac.
Change-Id: I337f2a8e777394e586f659fadd819cf7dfc0a332
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104546
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105885
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 001b692a43b4..5150a27b6a62 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta $(if $(CROSS_COMPILING),\ CROSS_COMPILE=1 \ NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ - $(if $(filter MACOSX-arm64,$(OS)-$(shell uname -m)), \ + $(if $(filter MACOSX-X86_64-arm64,$(OS)-$(CPUNAME)-$(shell uname -m)), \ CPU_ARCH=x86_64 \ NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ NSDISTMODE=copy \ |