diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 16:09:46 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 16:09:46 +0000 |
| commit | d41d6a11ac1f256ed1daa9efc0716bdda2bcb198 (patch) | |
| tree | 104daae73551cd986965fd86f9e60fb604cecb57 /build | |
| parent | 102fe94bc4f020735ea31d33815ad69b887cf197 (diff) | |
| download | chromium_src-d41d6a11ac1f256ed1daa9efc0716bdda2bcb198.zip chromium_src-d41d6a11ac1f256ed1daa9efc0716bdda2bcb198.tar.gz chromium_src-d41d6a11ac1f256ed1daa9efc0716bdda2bcb198.tar.bz2 | |
Second attempt to fix linux redux builder
Numerous targets were depending on linux/system.gyp:nss even on the openssl build and the gyp update means it shows up as a link error.
BUG=None
TEST=Builds with and without use_openssl=1
Review URL: http://codereview.chromium.org/7050040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/linux/system.gyp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 587f31d..92240d3 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -74,12 +74,17 @@ }]] }, { - 'target_name': 'nss', + 'target_name': 'ssl', 'type': 'settings', 'conditions': [ ['_toolset=="target"', { 'conditions': [ - ['use_system_ssl==0', { + ['use_openssl==1', { + 'dependencies': [ + '../../third_party/openssl/openssl.gyp:openssl', + ], + }], + ['use_openssl==0 and use_system_ssl==0', { 'dependencies': [ '../../net/third_party/nss/ssl.gyp:ssl', '../../third_party/zlib/zlib.gyp:zlib', @@ -106,7 +111,8 @@ '<!@(<(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)', @@ -123,8 +129,8 @@ '<!@(<(pkg-config) --libs-only-l nss)', ], }, - } - ]] + }], + ] }], ], }, |