diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-10-19 20:52:46 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-11-24 10:09:41 +0100 |
| commit | 8d248341f219ea65fcf548aeb303a0f177848dd4 (patch) | |
| tree | 24c1761a0ff3be82de60f57561ab82c12588124f /external | |
| parent | fffd33a5c64039f0220cf1f1dafe658e12df2900 (diff) | |
Fix nss build for 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/+/106467
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 38b1a615808b..5de54f467ecd 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -53,6 +53,9 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta $(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \ $(if $(filter iOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \ NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ + $(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 \ $(MAKE) AR="$(AR)" \ RANLIB="$(RANLIB)" \ |