diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-10-21 01:49:38 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-10-21 01:49:38 +0300 |
| commit | a8c24b25fd9fb21097a08a22797bf61b59099ea1 (patch) | |
| tree | 9fd8758501180670e4a799a7f23bb9ecbc84a322 /external | |
| parent | bf8fb8cfc3d08bf251b2099db6590af6c09c015e (diff) | |
Cross-compilation fix
Change-Id: I205afbd9c1cbe3a286359036cbdcf6aa9d986f71
Diffstat (limited to 'external')
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 6d2ab457d3b1..f518bb4e1a0e 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -72,7 +72,11 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject $(if $(filter IOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \ NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") \ NSDISTMODE=copy \ - $(MAKE) -j1 AR="$(AR)" RANLIB="$(RANLIB)" NMEDIT="$(NM)edit" nss_build_all \ + $(MAKE) -j1 AR="$(AR)" \ + RANLIB="$(RANLIB)" \ + NMEDIT="$(NM)edit" \ + $(if $(CROSS_COMPILING),NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ + nss_build_all \ && rm -f $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \ $(if $(filter MACOSX,$(OS)),\ && chmod u+w $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.dylib \ |