diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-06-02 15:48:13 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-06-02 15:50:41 +0200 |
| commit | 9a9b116a1fd438f265ff8b6de59f2b2c6bdb0d48 (patch) | |
| tree | bc616102c9445f2a426299d0635bc75d77f4343a /external/curl | |
| parent | 0b8b96ed515eec0a560812be73d4c9742f26e23b (diff) | |
curl: simplify SSL conditional
Change-Id: I210774ef7432257a3154e8981c0d53e9e63b2110
Diffstat (limited to 'external/curl')
| -rw-r--r-- | external/curl/ExternalProject_curl.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 4222419c6ad3..e31f5d64aee9 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -42,10 +42,9 @@ $(call gb_ExternalProject_get_state_target,curl,build): CPPFLAGS="$(curl_CPPFLAGS)" \ LDFLAGS=$(curl_LDFLAGS) \ ./configure \ - $(if $(filter IOS MACOSX,$(OS)),,--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \ - $(if $(filter IOS,$(OS)),--with-darwinssl) \ - $(if $(filter MACOSX,$(OS)),\ - --with-darwinssl) \ + $(if $(filter IOS MACOSX,$(OS)),\ + --with-darwinssl,\ + --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 \ |