Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(995)

Side by Side Diff: build/linux/system.gyp

Issue 415005: Linux: add next-protocol-negotiation to libssl. (Closed)
Patch Set: Addressing wtc's comments. Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 ], 82 ],
83 'libraries': [ 83 'libraries': [
84 '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")', 84 '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
85 ], 85 ],
86 }, 86 },
87 }, { 87 }, {
88 'direct_dependent_settings': { 88 'direct_dependent_settings': {
89 'cflags': [ 89 'cflags': [
90 '<!@(<(pkg-config) --cflags nss)', 90 '<!@(<(pkg-config) --cflags nss)',
91 ], 91 ],
92 'defines': [
93 'USE_SYSTEM_SSL',
94 ],
92 }, 95 },
93 'link_settings': { 96 'link_settings': {
94 'ldflags': [ 97 'ldflags': [
95 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)', 98 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
96 ], 99 ],
97 'libraries': [ 100 'libraries': [
98 '<!@(<(pkg-config) --libs-only-l nss)', 101 '<!@(<(pkg-config) --libs-only-l nss)',
99 ], 102 ],
100 }, 103 },
101 }]] 104 }]]
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 # }, 255 # },
253 # }, 256 # },
254 ], 257 ],
255 } 258 }
256 259
257 # Local Variables: 260 # Local Variables:
258 # tab-width:2 261 # tab-width:2
259 # indent-tabs-mode:nil 262 # indent-tabs-mode:nil
260 # End: 263 # End:
261 # vim: set expandtab tabstop=2 shiftwidth=2: 264 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « base/nss_init.cc ('k') | net/base/ssl_config_service.h » ('j') | net/base/ssl_config_service.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698