diff options
| author | Tor Lillqvist <tml@iki.fi> | 2020-07-04 23:07:52 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-09-19 08:28:35 +0200 |
| commit | 094f74455f5703c4b85da50a95cdbfb991265fcb (patch) | |
| tree | 0ad56c59b75470df12a0d91cbf09bd4c87b727fb /external | |
| parent | ea7fcc19fd22c655755b11033390a2005496d8fe (diff) | |
Set CROSS_COMPILE=1 when cross-compiling nss
Change-Id: Iad826eb83e4c49078e6c668661446b5b70e6a981
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97987
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103022
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index c9b5d81cb4e7..2e304bf4f99b 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -46,6 +46,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta $(if $(filter LINUX,$(OS)),$(if $(ENABLE_DBGUTIL),,BUILD_OPT=1)) \ $(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \ $(if $(CROSS_COMPILING),\ + CROSS_COMPILE=1 \ $(if $(filter ARM64,$(CPUNAME)),CPU_ARCH=aarch64) \ NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ NSDISTMODE=copy \ |