diff options
Diffstat (limited to 'build/linux')
| -rw-r--r-- | build/linux/system.gyp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 587f31d..92240d3 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -74,12 +74,17 @@ }]] }, { - 'target_name': 'nss', + 'target_name': 'ssl', 'type': 'settings', 'conditions': [ ['_toolset=="target"', { 'conditions': [ - ['use_system_ssl==0', { + ['use_openssl==1', { + 'dependencies': [ + '../../third_party/openssl/openssl.gyp:openssl', + ], + }], + ['use_openssl==0 and use_system_ssl==0', { 'dependencies': [ '../../net/third_party/nss/ssl.gyp:ssl', '../../third_party/zlib/zlib.gyp:zlib', @@ -106,7 +111,8 @@ '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")', ], }, - }, { + }], + ['use_openssl==0 and use_system_ssl==1', { 'direct_dependent_settings': { 'cflags': [ '<!@(<(pkg-config) --cflags nss)', @@ -123,8 +129,8 @@ '<!@(<(pkg-config) --libs-only-l nss)', ], }, - } - ]] + }], + ] }], ], }, |