diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-10-14 09:09:34 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-11-15 10:44:19 +0100 |
| commit | 8f6ed6d4bd3d37bba02b540d0da917cfb4380d03 (patch) | |
| tree | 0c0d4dd3c12082bcbd1e87edddb7afe428a8ec02 /external | |
| parent | 3ba7778bf28227215c9c3fd915a35ddbc25634d7 (diff) | |
Fix build for Intel on an Apple Silicon Mac
Change-Id: Id1a5906db87b05218b0810045c698e5ab2a09eca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104271
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105884
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.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 f35acd59eec4..001b692a43b4 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -48,6 +48,9 @@ $(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)), \ + CPU_ARCH=x86_64 \ + NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ NSDISTMODE=copy \ $(MAKE) \ -j1 \ |