diff options
| -rw-r--r-- | build/linux/system.gyp | 10 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index c51d0a7..62bbcbb 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -81,7 +81,15 @@ ], 'direct_dependent_settings': { 'cflags': [ - '-Inet/third_party/nss/ssl', + # We need for our local copies of the libssl 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 + # out of $(pkg-config --cflags nss) and GYP include paths + # come after cflags on the command line. So we have these + # bodges: + '-I../net/third_party/nss/ssl', # for scons + '-Inet/third_party/nss/ssl', # for make '<!@(<(pkg-config) --cflags nss)', ], }, diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index c013ed8..f6a745e 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -312,6 +312,8 @@ int SSLClientSocketNSS::InitializeSSLOptions() { rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_DEFLATE, PR_TRUE); if (rv != SECSuccess) LOG(INFO) << "SSL_ENABLE_DEFLATE failed. Old system nss?"; +#else +#error This is a temporary hack to check that the builders are using the correct header files. It will be removed once a build has finished. #endif #ifdef SSL_NEXT_PROTO_NEGOTIATED |