diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2021-01-28 15:17:51 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2021-01-28 23:11:13 +0100 |
| commit | b8a968d83dec047bed47c1d7a6fac1b14dc7651b (patch) | |
| tree | 0ffa3c85b00f06d29a54ceb76e62c15fb512aa6b /external/nss | |
| parent | b7175495249958c430e16c0bad358eee0032b65a (diff) | |
nss: makefile bitrot: no need for android spcial case anymore
check for AARCH64 is done for all OS now, so get rid of the superfluous
statement.
The all-OS line was initially ARM64 for apple silicon, then AARCH64 was
added in addtion since that is what ~all other tools use as label - and
finally use withing LO was also unified to use AARCH64 and ARM64 was
removed…
Change-Id: Ief7e5d8bd399c839ff2910fa91ca5bbbff4bcf31
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110080
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'external/nss')
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 759ef461e3f8..ef2ae95d7a5f 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -51,7 +51,6 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ $(call gb_Trace_StartRange,nss,EXTERNAL) $(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 AARCH64,$(CPUNAME)),USE_64=1 CPU_ARCH=aarch64) \ $(if $(filter MACOSX,$(OS)),\ MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \ |