diff options
| author | Tor Lillqvist <tml@iki.fi> | 2020-07-04 22:37:09 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-09-18 23:45:43 +0200 |
| commit | c894bf28ad80e49c09311327a43891e1f5aab4c7 (patch) | |
| tree | ed32a8eba4741ccb060f3c1b3137d0017cc24667 | |
| parent | We don't actually build nss for iOS, but if we did, it would be for arm64 (diff) | |
| download | core-c894bf28ad80e49c09311327a43891e1f5aab4c7.tar.gz core-c894bf28ad80e49c09311327a43891e1f5aab4c7.zip | |
Be more generic for CPUNAME=ARM64
It's used not just for iOS but can be macOS too.
Also, nss wants to call it CPU_ARCH=aarch64.
Change-Id: I6398c3bf1409f2ccf16b0d154ad7c2b56f493b15
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97986
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103021
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index cb22bf7a8c1f..c9b5d81cb4e7 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -39,14 +39,14 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta $(call gb_ExternalProject_run,build,\ $(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \ $(if $(filter ANDROID,$(OS)),$(if $(filter AARCH64,$(CPUNAME)),USE_64=1)) \ - $(if $(filter iOS,$(OS)),USE_64=1) \ + $(if $(filter ARM64,$(CPUNAME)),USE_64=1) \ $(if $(filter MACOSX,$(OS)),\ MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \ NSS_USE_SYSTEM_SQLITE=1) \ $(if $(filter LINUX,$(OS)),$(if $(ENABLE_DBGUTIL),,BUILD_OPT=1)) \ $(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \ $(if $(CROSS_COMPILING),\ - $(if $(filter iOS-ARM64,$(OS)-$(CPUNAME)),CPU_ARCH=arm64) \ + $(if $(filter ARM64,$(CPUNAME)),CPU_ARCH=aarch64) \ NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ NSDISTMODE=copy \ $(MAKE) AR="$(AR)" \ |