Chromium Code Reviews| Index: build/linux/system.gyp |
| diff --git a/build/linux/system.gyp b/build/linux/system.gyp |
| index 816c584d78f7e0e8500f7cb012bc5cecbecccfee..3e1e8a7c22fbff4d87292103d813320ac1831f9a 100644 |
| --- a/build/linux/system.gyp |
| +++ b/build/linux/system.gyp |
| @@ -15,7 +15,7 @@ |
| }], |
| [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', { |
| 'variables': { |
| - # We use our own copy of libssl, although we still need to link against |
| + # We use our own copy of libssl3, although we still need to link against |
| # the rest of NSS. |
| 'use_system_ssl%': 0, |
| }, |
| @@ -81,7 +81,7 @@ |
| ], |
| 'direct_dependent_settings': { |
| 'cflags': [ |
| - # We need for our local copies of the libssl headers to come |
| + # We need for our local copies of the libssl3 headers to come |
| # first, otherwise the code will build, but will fallback to |
| # the set of features advertised in the system headers. |
| # Unfortunately, there's no include path that we can filter |
| @@ -102,7 +102,7 @@ |
| '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")', |
| ], |
| }, |
| - }, { |
| + }, { |
| 'direct_dependent_settings': { |
| 'cflags': [ |
| '<!@(<(pkg-config) --cflags nss)', |
| @@ -119,7 +119,8 @@ |
| '<!@(<(pkg-config) --libs-only-l nss)', |
| ], |
| }, |
| - }]] |
| + } |
| + ]] |
| }], |
| ], |
| }, |
| @@ -320,6 +321,27 @@ |
| ], |
| }, |
| }, |
| + { |
| + 'target_name': 'openssl', |
| + 'type': 'settings', |
| + 'conditions': [ |
| + ['use_openssl==1', { |
| + 'direct_dependent_settings': { |
| + 'defines': [ |
| + 'USE_OPENSSL', |
|
wtc
2010/09/28 18:08:35
You should document that eventually USE_OPENSSL an
joth
2010/09/29 11:58:54
Done.
|
| + ], |
| + 'include_dirs': [ |
| + '<!@(<(pkg-config) --cflags openssl)', |
| + ], |
| + }, |
| + 'link_settings': { |
| + 'libraries': [ |
| + '<!@(<(pkg-config) --libs-only-l openssl)', |
| + ], |
| + }, |
| + },], |
| + ], |
| + }, |
| ], |
| } |