diff options
| author | Tor Lillqvist <tml@iki.fi> | 2020-11-23 02:27:18 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-11-23 16:16:15 +0100 |
| commit | 6903605f49a3a3c3a63770dc9a7eb135c9fbbd09 (patch) | |
| tree | 2b776df74d74f5b9171450f4c451bfe22f589a94 /external | |
| parent | Use USE_DLFCN also on macOS on arm64 (diff) | |
| download | core-6903605f49a3a3c3a63770dc9a7eb135c9fbbd09.tar.gz core-6903605f49a3a3c3a63770dc9a7eb135c9fbbd09.zip | |
Clean up arm64 confusion a bit
Set nss's CPU_ARCH to aarch64 also when compiling to arm64 on arm64,
without any cross-compiling involved.
Change-Id: I2eb9fb7b9547e5ded75ca242ea7ef09c826bf561
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106377
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, 1 insertions, 2 deletions
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index bdb5d10f4318..38b1a615808b 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -42,7 +42,7 @@ $(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 ARM64,$(CPUNAME)),USE_64=1) \ + $(if $(filter AARCH64 ARM64,$(CPUNAME)),USE_64=1 CPU_ARCH=aarch64) \ $(if $(filter MACOSX,$(OS)),\ $(if $(filter-out POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \ NSS_USE_SYSTEM_SQLITE=1) \ @@ -52,7 +52,6 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta CROSS_COMPILE=1 \ $(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \ $(if $(filter iOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \ - $(if $(filter ARM64,$(CPUNAME)),CPU_ARCH=aarch64) \ NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ NSDISTMODE=copy \ $(MAKE) AR="$(AR)" \ |