diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 7 | ||||
| -rw-r--r-- | build/linux/system.gyp | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/build/all.gyp b/build/all.gyp index 39513ed..175332b 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -19,6 +19,7 @@ '../ipc/ipc.gyp:*', '../media/media.gyp:*', '../net/net.gyp:*', + '../net/third_party/nss/ssl.gyp:*', '../printing/printing.gyp:*', '../sdch/sdch.gyp:*', '../skia/skia.gyp:*', @@ -58,6 +59,11 @@ '../third_party/yasm/yasm.gyp:*#host', ], }], + ['OS=="mac" or OS=="win"', { + 'dependencies': [ + '../third_party/nss/nss.gyp:*', + ], + }], ['OS=="mac"', { 'dependencies': [ '../third_party/ocmock/ocmock.gyp:*', @@ -81,7 +87,6 @@ 'dependencies': [ '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*', '../tools/xdisplaycheck/xdisplaycheck.gyp:*', - '../net/third_party/nss/nss.gyp:*', ], }], ['OS=="win"', { diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 94650e9..dbd394b 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -76,7 +76,7 @@ 'conditions': [ ['use_system_ssl==0', { 'dependencies': [ - '../../net/third_party/nss/nss.gyp:ssl', + '../../net/third_party/nss/ssl.gyp:ssl', '../../third_party/zlib/zlib.gyp:zlib', ], 'direct_dependent_settings': { |