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

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

Issue 484003: Revert 34195 - Make sure the 'use_system_*' variables are actually visible in... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
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 | Annotate | Revision Log
« no previous file with comments | « build/install-build-deps.sh ('k') | third_party/bzip2/bzip2.gyp » ('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 },
11 }, { 11 }, {
12 'variables': { 12 'variables': {
13 'pkg-config': 'pkg-config' 13 'pkg-config': 'pkg-config'
14 }, 14 },
15 }], 15 }],
16 [ 'OS=="linux"', {
17 'variables': {
18 # We use our own copy of libssl, although we still need to link against
19 # the rest of NSS.
20 'use_system_ssl%': 0,
21 },
22 }, { # OS!="linux"
23 'variables': {
24 'use_system_ssl%': 1,
25 },
26 }],
27 ], 16 ],
28 17
18 'variables': {
19 'use_system_ssl%': 1,
20 },
29 21
30 'targets': [ 22 'targets': [
31 { 23 {
32 'target_name': 'gtk', 24 'target_name': 'gtk',
33 'type': 'settings', 25 'type': 'settings',
34 'conditions': [ 26 'conditions': [
35 ['_toolset=="target"', { 27 ['_toolset=="target"', {
36 'direct_dependent_settings': { 28 'direct_dependent_settings': {
37 'cflags': [ 29 'cflags': [
38 '<!@(<(pkg-config) --cflags gtk+-2.0 gthread-2.0)', 30 '<!@(<(pkg-config) --cflags gtk+-2.0 gthread-2.0)',
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 # }, 256 # },
265 # }, 257 # },
266 ], 258 ],
267 } 259 }
268 260
269 # Local Variables: 261 # Local Variables:
270 # tab-width:2 262 # tab-width:2
271 # indent-tabs-mode:nil 263 # indent-tabs-mode:nil
272 # End: 264 # End:
273 # vim: set expandtab tabstop=2 shiftwidth=2: 265 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/install-build-deps.sh ('k') | third_party/bzip2/bzip2.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698