diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-11-01 10:57:21 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-12-02 13:30:50 +0100 |
| commit | a9e04c08b8b3baa943acf69e5456701dce78041c (patch) | |
| tree | 20569147447777c96d92c19968fb8605122ca472 /external/nss/ExternalProject_nss.mk | |
| parent | 04645403104c7c8a767410d1bcbd692c056818a4 (diff) | |
android: Fix nss build on aarch64.
Change-Id: I51c03e13fba4619a881ade27d149722698859815
Reviewed-on: https://gerrit.libreoffice.org/81888
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'external/nss/ExternalProject_nss.mk')
| -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 2e93d7000c3a..4d175e184da5 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -34,8 +34,8 @@ else # OS!=WNT $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_ExternalProject_run,build,\ $(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \ - $(if $(filter iOS,$(OS)),\ - $(if $(filter arm64,$(CC)),USE_64=1)) \ + $(if $(filter ANDROID,$(OS)),$(if $(filter AARCH64,$(CPUNAME)),USE_64=1)) \ + $(if $(filter iOS,$(OS)),$(if $(filter ARM64,$(CPUNAME)),USE_64=1)) \ $(if $(filter MACOSX,$(OS)),\ $(if $(filter-out POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \ NSS_USE_SYSTEM_SQLITE=1) \ |