diff options
Diffstat (limited to 'crypto/crypto.gyp')
| -rw-r--r-- | crypto/crypto.gyp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index 02ef8e1..e662e52 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -19,17 +19,24 @@ ], 'conditions': [ [ 'os_posix == 1 and OS != "mac"', { - 'dependencies': [ - '../build/linux/system.gyp:ssl', - ], - 'export_dependent_settings': [ - '../build/linux/system.gyp:ssl', - ], 'conditions': [ [ 'chromeos==1', { 'sources/': [ ['include', '_chromeos\\.cc$'] ] }, ], + [ 'use_openssl==1', { + 'dependencies': [ + '../third_party/openssl/openssl.gyp:openssl', + ], + }, { # use_openssl==0 + 'dependencies': [ + '../build/linux/system.gyp:nss', + ], + 'export_dependent_settings': [ + '../build/linux/system.gyp:nss', + ], + } + ], ], }, { # os_posix != 1 or OS == "mac" 'sources/': [ @@ -195,7 +202,7 @@ ], ], 'dependencies': [ - '../build/linux/system.gyp:ssl', + '../build/linux/system.gyp:nss', ], }, { # os_posix != 1 or OS == "mac" 'sources!': [ |