diff options
| author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 22:04:02 +0000 |
|---|---|---|
| committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 22:04:02 +0000 |
| commit | 2c6f51d3b6adac62075b3427d2cffdf77718315d (patch) | |
| tree | 642c9218482ce5faa919489187f39757efae0aa1 /build/linux | |
| parent | 7ca1273a8ea05984b1f9dcccba3d19743b087f12 (diff) | |
| download | chromium_src-2c6f51d3b6adac62075b3427d2cffdf77718315d.zip chromium_src-2c6f51d3b6adac62075b3427d2cffdf77718315d.tar.gz chromium_src-2c6f51d3b6adac62075b3427d2cffdf77718315d.tar.bz2 | |
Make sure the 'use_system_*' variables are actually visible in the relevant gyp files.
BUG=29738
Review URL: http://codereview.chromium.org/479005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34195 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/linux')
| -rw-r--r-- | build/linux/system.gyp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index a707343..c51d0a7 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -13,11 +13,19 @@ 'pkg-config': 'pkg-config' }, }], + [ 'OS=="linux"', { + 'variables': { + # We use our own copy of libssl, although we still need to link against + # the rest of NSS. + 'use_system_ssl%': 0, + }, + }, { # OS!="linux" + 'variables': { + 'use_system_ssl%': 1, + }, + }], ], - 'variables': { - 'use_system_ssl%': 1, - }, 'targets': [ { |