diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-02-06 16:13:25 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-02-17 11:42:47 -0800 |
| commit | b29bce0936ac711b7fa6c2a43684696021dfb668 (patch) | |
| tree | 8515a6923421df3ef7c5b2dd660c9d11f1016b65 /gyp/http-curl.gypi | |
| parent | fe0baffe0dfbf369f422e175c0fcf3dda9055118 (diff) | |
| download | qtlocation-mapboxgl-b29bce0936ac711b7fa6c2a43684696021dfb668.tar.gz | |
add ca bundle loading back to CURL
Diffstat (limited to 'gyp/http-curl.gypi')
| -rw-r--r-- | gyp/http-curl.gypi | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/gyp/http-curl.gypi b/gyp/http-curl.gypi index 87edff2492..bfb2054d55 100644 --- a/gyp/http-curl.gypi +++ b/gyp/http-curl.gypi @@ -14,6 +14,24 @@ '../include', ], + 'conditions': [ + ['host == "android"', { + 'variables': { + # Android uses libzip and openssl to set CURL's CA bundle. + 'cflags_cc': [ '<@(zip_cflags)', '<@(openssl_cflags)' ], + 'ldflags': [ '<@(zip_ldflags)', ], + 'libraries': [ '<@(zip_static_libs)', ], + }, + }], + ['OS == "mac"', { + 'xcode_settings': { + 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], + }, + }, { + 'cflags_cc': [ '<@(cflags_cc)' ], + }], + ], + 'variables': { 'cflags_cc': [ '<@(uv_cflags)', @@ -30,16 +48,6 @@ ], }, - 'conditions': [ - ['OS == "mac"', { - 'xcode_settings': { - 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], - }, - }, { - 'cflags_cc': [ '<@(cflags_cc)' ], - }], - ], - 'link_settings': { 'conditions': [ ['OS == "mac"', { |