Linux: fix scons build so that libssl gets the right headers.

build/linux/system.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'conditions': [
     ['sysroot!=""', {
       'variables': {
         'pkg-config': './pkg-config-wrapper "<(sysroot)"',
       },
@@ skipping 63 matching lines @@
       'conditions': [
         ['_toolset=="target"', {
           'conditions': [
             ['use_system_ssl==0', {
               'dependencies': [
                 '../../net/third_party/nss/nss.gyp:ssl',
                 '../../third_party/zlib/zlib.gyp:zlib',
               ],
               '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)',
                 ],
               },
               'link_settings': {
                 'ldflags': [
                   '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
                 ],
                 'libraries': [
                   '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
                 ],
@@ skipping 169 matching lines @@
 #       },
 #     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: