diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-19 13:19:57 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-20 14:20:47 +0000 |
| commit | 8092d344fa8cf9af692bc4e0ea544738a299b835 (patch) | |
| tree | 466efa641d64e6ebf43840609a6aa50032276f31 /external/curl | |
| parent | 862ae89a14e6052fd0ff91ee4c143c35829f8e01 (diff) | |
use new ENABLE_NSS for code which needs nss
which isn't available on a static-only build (iOS and fuzzing) and
android
Change-Id: I99bb7c0b45d4499579ddf73f469a762ddcae99ab
Reviewed-on: https://gerrit.libreoffice.org/32182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/curl')
| -rw-r--r-- | external/curl/ExternalProject_curl.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 1f709725c5b7..48d0b6a8e6bb 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -10,7 +10,7 @@ $(eval $(call gb_ExternalProject_ExternalProject,curl)) $(eval $(call gb_ExternalProject_use_externals,curl,\ - $(if $(filter TRUE,$(DISABLE_DYNLOADING)),,nss3) \ + $(if $(ENABLE_NSS),nss3) \ zlib \ )) @@ -44,7 +44,7 @@ $(call gb_ExternalProject_get_state_target,curl,build): ./configure \ $(if $(filter IOS MACOSX,$(OS)),\ --with-darwinssl,\ - $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--without-nss,--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out"))) \ + $(if $(ENABLE_NSS),--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out"),--without-nss)) \ --without-ssl --without-gnutls --without-polarssl --without-cyassl --without-axtls \ --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \ --disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \ |