diff options
| author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 17:10:17 +0000 |
|---|---|---|
| committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 17:10:17 +0000 |
| commit | aef0f2d59ae0b1ab954907e53c8ba145e2cd1e1b (patch) | |
| tree | b7adc732ccdc7891e7aaf58e92d509b3f3566665 /net/third_party | |
| parent | 43c7bc30cba6878344087ae8580f4ce9d4fe0af9 (diff) | |
| download | chromium_src-aef0f2d59ae0b1ab954907e53c8ba145e2cd1e1b.zip chromium_src-aef0f2d59ae0b1ab954907e53c8ba145e2cd1e1b.tar.gz chromium_src-aef0f2d59ae0b1ab954907e53c8ba145e2cd1e1b.tar.bz2 | |
Fix libssl.so link failures on Linux shared lib build.
http://build.chromium.org/buildbot/waterfall.fyi/builders/Chromium%20Linux%20Builder%20(dbg-shlib)/builds/6369/steps/compile/logs/stdio
This has been broken for a long time, I think basically since Linux switched to
use_system_ssl=0.
Also fix a couple unrelated shared lib failures in media.
Review URL: http://codereview.chromium.org/553097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party')
| -rw-r--r-- | net/third_party/nss/nss.gyp | 6 |
1 files changed, 6 insertions, 0 deletions
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!': [ |