diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 17:02:45 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 17:02:45 +0000 |
| commit | 8d84dcb83f501e51ff28b28d2a871ad80deb1ccc (patch) | |
| tree | 48fb0b19da2f48e0c1a6be1f05d81becc22a7c72 /build/linux | |
| parent | 1e029feda144670dd1b604ab8159e20486e93504 (diff) | |
| download | chromium_src-8d84dcb83f501e51ff28b28d2a871ad80deb1ccc.zip chromium_src-8d84dcb83f501e51ff28b28d2a871ad80deb1ccc.tar.gz chromium_src-8d84dcb83f501e51ff28b28d2a871ad80deb1ccc.tar.bz2 | |
Revert 87309 - 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
TBR=joth@chromium.org
Review URL: http://codereview.chromium.org/7054041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/linux')
| -rw-r--r-- | build/linux/system.gyp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 92240d3..587f31d 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -74,17 +74,12 @@ }]] }, { - 'target_name': 'ssl', + 'target_name': 'nss', 'type': 'settings', 'conditions': [ ['_toolset=="target"', { 'conditions': [ - ['use_openssl==1', { - 'dependencies': [ - '../../third_party/openssl/openssl.gyp:openssl', - ], - }], - ['use_openssl==0 and use_system_ssl==0', { + ['use_system_ssl==0', { 'dependencies': [ '../../net/third_party/nss/ssl.gyp:ssl', '../../third_party/zlib/zlib.gyp:zlib', @@ -111,8 +106,7 @@ '<!@(<(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)', @@ -129,8 +123,8 @@ '<!@(<(pkg-config) --libs-only-l nss)', ], }, - }], - ] + } + ]] }], ], }, |