| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'conditions': [ | 6 'conditions': [ |
| 7 ['sysroot!=""', { | 7 ['sysroot!=""', { |
| 8 'variables': { | 8 'variables': { |
| 9 'pkg-config': './pkg-config-wrapper "<(sysroot)"', | 9 'pkg-config': './pkg-config-wrapper "<(sysroot)"', |
| 10 }, | 10 }, |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 ], | 86 ], |
| 87 'direct_dependent_settings': { | 87 'direct_dependent_settings': { |
| 88 'cflags': [ | 88 'cflags': [ |
| 89 # We need for our local copies of the libssl3 headers to come | 89 # We need for our local copies of the libssl3 headers to come |
| 90 # first, otherwise the code will build, but will fallback to | 90 # first, otherwise the code will build, but will fallback to |
| 91 # the set of features advertised in the system headers. | 91 # the set of features advertised in the system headers. |
| 92 # Unfortunately, there's no include path that we can filter | 92 # Unfortunately, there's no include path that we can filter |
| 93 # out of $(pkg-config --cflags nss) and GYP include paths | 93 # out of $(pkg-config --cflags nss) and GYP include paths |
| 94 # come after cflags on the command line. So we have these | 94 # come after cflags on the command line. So we have these |
| 95 # bodges: | 95 # bodges: |
| 96 '-I../net/third_party/nss/ssl', # for scons | |
| 97 '-Inet/third_party/nss/ssl', # for make | 96 '-Inet/third_party/nss/ssl', # for make |
| 98 '-IWebKit/chromium/net/third_party/nss/ssl', # for make in we
bkit | 97 '-IWebKit/chromium/net/third_party/nss/ssl', # for make in we
bkit |
| 99 '<!@(<(pkg-config) --cflags nss)', | 98 '<!@(<(pkg-config) --cflags nss)', |
| 100 ], | 99 ], |
| 101 }, | 100 }, |
| 102 'link_settings': { | 101 'link_settings': { |
| 103 'ldflags': [ | 102 'ldflags': [ |
| 104 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)', | 103 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)', |
| 105 ], | 104 ], |
| 106 'libraries': [ | 105 'libraries': [ |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 ], | 370 ], |
| 372 }, | 371 }, |
| 373 ], | 372 ], |
| 374 } | 373 } |
| 375 | 374 |
| 376 # Local Variables: | 375 # Local Variables: |
| 377 # tab-width:2 | 376 # tab-width:2 |
| 378 # indent-tabs-mode:nil | 377 # indent-tabs-mode:nil |
| 379 # End: | 378 # End: |
| 380 # vim: set expandtab tabstop=2 shiftwidth=2: | 379 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |