summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-12-19 09:30:03 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-12-19 09:30:03 +0000
commitea992517bf8b1d48c2e02717f5bc9efc3ebb1c2e (patch)
tree71d8548bd0f2aa1fbf10efcf8faaea505dd8397a /external
parent6cb661fba4a56782e521a4ede3db17d535f7cd4e (diff)
with missing nss build curl and vcl appropiately
Change-Id: Iaef197e9ab736c219897933a76f4c75a3e3acaa6
Diffstat (limited to 'external')
-rw-r--r--external/curl/ExternalProject_curl.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index 76b4a4556103..1f709725c5b7 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,\
- nss3 \
+ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),,nss3) \
zlib \
))
@@ -44,7 +44,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
./configure \
$(if $(filter IOS MACOSX,$(OS)),\
--with-darwinssl,\
- --with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \
+ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--without-nss,--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out"))) \
--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 \