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

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

Issue 2771003: Add another path for NSS when building in a webkit checkout with (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 6 months 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 ], 81 ],
82 'direct_dependent_settings': { 82 'direct_dependent_settings': {
83 'cflags': [ 83 'cflags': [
84 # We need for our local copies of the libssl headers to come 84 # We need for our local copies of the libssl headers to come
85 # first, otherwise the code will build, but will fallback to 85 # first, otherwise the code will build, but will fallback to
86 # the set of features advertised in the system headers. 86 # the set of features advertised in the system headers.
87 # Unfortunately, there's no include path that we can filter 87 # Unfortunately, there's no include path that we can filter
88 # out of $(pkg-config --cflags nss) and GYP include paths 88 # out of $(pkg-config --cflags nss) and GYP include paths
89 # come after cflags on the command line. So we have these 89 # come after cflags on the command line. So we have these
90 # bodges: 90 # bodges:
91 '-I../net/third_party/nss/ssl', # for scons 91 '-I../net/third_party/nss/ssl', # for scons
92 '-Inet/third_party/nss/ssl', # for make 92 '-Inet/third_party/nss/ssl', # for make
93 '-IWebKit/chromium/net/third_party/nss/ssl', # for make in we bkit
93 '<!@(<(pkg-config) --cflags nss)', 94 '<!@(<(pkg-config) --cflags nss)',
94 ], 95 ],
95 }, 96 },
96 'link_settings': { 97 'link_settings': {
97 'ldflags': [ 98 'ldflags': [
98 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)', 99 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
99 ], 100 ],
100 'libraries': [ 101 'libraries': [
101 '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")', 102 '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
102 ], 103 ],
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 }, 293 },
293 }, 294 },
294 ], 295 ],
295 } 296 }
296 297
297 # Local Variables: 298 # Local Variables:
298 # tab-width:2 299 # tab-width:2
299 # indent-tabs-mode:nil 300 # indent-tabs-mode:nil
300 # End: 301 # End:
301 # vim: set expandtab tabstop=2 shiftwidth=2: 302 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698