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