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

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

Issue 469018: Fix build with use_system_zlib=1 (Closed)
Patch Set: Created 11 years 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 | net/flip/flip_framer.cc » ('j') | 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 }, 62 },
63 { 63 {
64 'target_name': 'nss', 64 'target_name': 'nss',
65 'type': 'settings', 65 'type': 'settings',
66 'conditions': [ 66 'conditions': [
67 ['_toolset=="target"', { 67 ['_toolset=="target"', {
68 'conditions': [ 68 'conditions': [
69 ['use_system_ssl==0', { 69 ['use_system_ssl==0', {
70 'dependencies': [ 70 'dependencies': [
71 '../../net/third_party/nss/nss.gyp:ssl', 71 '../../net/third_party/nss/nss.gyp:ssl',
72 '../../third_party/zlib/zlib.gyp:zlib',
72 ], 73 ],
73 'direct_dependent_settings': { 74 'direct_dependent_settings': {
74 'cflags': [ 75 'cflags': [
75 '-Inet/third_party/nss/ssl', 76 '-Inet/third_party/nss/ssl',
76 '<!@(<(pkg-config) --cflags nss)', 77 '<!@(<(pkg-config) --cflags nss)',
77 ], 78 ],
78 }, 79 },
79 'link_settings': { 80 'link_settings': {
80 'ldflags': [ 81 'ldflags': [
81 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)', 82 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 # }, 256 # },
256 # }, 257 # },
257 ], 258 ],
258 } 259 }
259 260
260 # Local Variables: 261 # Local Variables:
261 # tab-width:2 262 # tab-width:2
262 # indent-tabs-mode:nil 263 # indent-tabs-mode:nil
263 # End: 264 # End:
264 # vim: set expandtab tabstop=2 shiftwidth=2: 265 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | net/flip/flip_framer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698