diff options
| -rw-r--r-- | media/media.gyp | 8 | ||||
| -rw-r--r-- | net/third_party/nss/nss.gyp | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp index af218a1..2c57239d 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -285,6 +285,13 @@ '../base/base.gyp:base_i18n', '../testing/gtest.gyp:gtest', ], + 'conditions': [ + ['OS=="linux" or OS=="freebsd"', { + 'dependencies': [ + '../build/linux/system.gyp:gtk', + ], + }], + ], 'sources': [ 'omx/omx_unittest.cc', 'omx/run_all_unittests.cc', @@ -358,6 +365,7 @@ ], 'link_settings': { 'libraries': [ + '-ldl', '-lX11', '-lXrender', '-lXext', diff --git a/net/third_party/nss/nss.gyp b/net/third_party/nss/nss.gyp index ec9861d..6e66aff 100644 --- a/net/third_party/nss/nss.gyp +++ b/net/third_party/nss/nss.gyp @@ -78,6 +78,12 @@ 'cflags': [ '<!@(<(pkg-config) --cflags nss)', ], + 'ldflags': [ + '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)', + ], + 'libraries': [ + '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")', + ], 'conditions': [ [ 'OS == "linux"', { 'sources!': [ |