diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-11 15:08:40 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-11 15:08:40 +0000 |
| commit | bf37b1d8ba2b7308b2b356112e614f0dbe195dd0 (patch) | |
| tree | 23a35d3e6e7212f7c3c12a6697e537b6e2b21b63 /build/linux | |
| parent | f425f7c824b213f35cd3fb8f68defd10599c1325 (diff) | |
| download | chromium_src-bf37b1d8ba2b7308b2b356112e614f0dbe195dd0.zip chromium_src-bf37b1d8ba2b7308b2b356112e614f0dbe195dd0.tar.gz chromium_src-bf37b1d8ba2b7308b2b356112e614f0dbe195dd0.tar.bz2 | |
openssl build fixes, and tidy the build files
Split out of http://codereview.chromium.org/4691003/
BUG=None
TEST=builds...
Review URL: http://codereview.chromium.org/4696004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/linux')
| -rw-r--r-- | build/linux/system.gyp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 271feef..cf25bb1 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -331,11 +331,8 @@ ['use_openssl==1', { 'direct_dependent_settings': { 'defines': [ - # OpenSSL support is in development. - # eventually USE_OPENSSL and USE_NSS will be mutually exclusive. - # During the transitional period, a use_openssl=1 build still - # needs to define USE_NSS, so it is necessary to test the - # USE_OPENSSL macro before testing USE_NSS. + # OpenSSL support is incomplete: http://crbug.com/62803. + # Defining USE_OPENSSL disables USE_NSS. 'USE_OPENSSL', ], 'include_dirs': [ |