[Libreoffice-commits] core.git: external/nss

[Christian Lohmaier (via logerrit)]

 external/nss/ExternalProject_nss.mk |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit b8a968d83dec047bed47c1d7a6fac1b14dc7651b
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Thu Jan 28 15:17:51 2021 +0100
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Jan 28 23:11:13 2021 +0100

    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 at googlemail.com>

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) \