diff options
| author | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-04 13:43:35 +0000 |
|---|---|---|
| committer | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-04 13:43:35 +0000 |
| commit | 2e99f7c101980a8958b28d990b6eb1ee385be35c (patch) | |
| tree | e368df6d29f7297b8441a91ce0d68a392633bc25 /net/third_party | |
| parent | 14df9e63ee9497eaed402e00cd4f95bfd2630476 (diff) | |
| download | chromium_src-2e99f7c101980a8958b28d990b6eb1ee385be35c.zip chromium_src-2e99f7c101980a8958b28d990b6eb1ee385be35c.tar.gz chromium_src-2e99f7c101980a8958b28d990b6eb1ee385be35c.tar.bz2 | |
Fix libssl to build properly with use_system_zlib==0.
This CL replaces CL 8059021, lost due to a git repo accident.
TBR=wtc
BUG=30704
TEST=build chromotocol_test_client
Review URL: http://codereview.chromium.org/8113013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103880 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party')
| -rw-r--r-- | net/third_party/nss/ssl.gyp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/third_party/nss/ssl.gyp b/net/third_party/nss/ssl.gyp index f5909ca..171a136 100644 --- a/net/third_party/nss/ssl.gyp +++ b/net/third_party/nss/ssl.gyp @@ -81,6 +81,9 @@ # Regrettably, NSS can't be compiled with NO_NSPR_10_SUPPORT yet. 'NO_NSPR_10_SUPPORT', ], + 'dependencies': [ + '../../../third_party/zlib/zlib.gyp:zlib', + ], 'msvs_disabled_warnings': [4018, 4244], 'conditions': [ [ 'OS=="mac"', { @@ -133,7 +136,6 @@ 'NSS_PLATFORM_CLIENT_AUTH', ], 'dependencies': [ - '../../../third_party/zlib/zlib.gyp:zlib', '../../../third_party/nss/nss.gyp:nspr', '../../../third_party/nss/nss.gyp:nss', ], |