diff options
| author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 17:31:45 +0000 |
|---|---|---|
| committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 17:31:45 +0000 |
| commit | 003be53b23e2d6dff8cf65759ca68d0140224468 (patch) | |
| tree | c94355bc2dd653d7fa34214a4f6d805c01e4d657 /third_party/zlib | |
| parent | 7513961de3f2571b5e034413304a7d466cb17e6b (diff) | |
| download | chromium_src-003be53b23e2d6dff8cf65759ca68d0140224468.zip chromium_src-003be53b23e2d6dff8cf65759ca68d0140224468.tar.gz chromium_src-003be53b23e2d6dff8cf65759ca68d0140224468.tar.bz2 | |
Make sure the 'use_system_*' variables are actually visible in the relevant gyp files.
Retrying r34195, this time without libxslt, since we don't want to use the
system version of that if we're not also using system libxml (merged from
http://codereview.chromium.org/481011).
BUG=29738
Review URL: http://codereview.chromium.org/486012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib')
| -rw-r--r-- | third_party/zlib/zlib.gyp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp index 44e1f8b..36613a7 100644 --- a/third_party/zlib/zlib.gyp +++ b/third_party/zlib/zlib.gyp @@ -4,7 +4,14 @@ { 'variables': { - 'use_system_zlib%': 0, + 'conditions': [ + [ 'OS=="linux"', { + # Link to system .so since we already use it due to GTK. + 'use_system_zlib%': 1, + }, { # OS!="linux" + 'use_system_zlib%': 0, + }], + ], }, 'conditions': [ ['use_system_zlib==0', { |