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

Side by Side Diff: build/common.gypi

Issue 9580032: Linux: Use gold for 32-bit builds as well. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 9 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 | Annotate | Revision Log
« 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 }], 391 }],
392 392
393 ['use_aura==1 or chromeos==1', { 393 ['use_aura==1 or chromeos==1', {
394 'enable_plugin_installation%': 0, 394 'enable_plugin_installation%': 0,
395 }, { 395 }, {
396 'enable_plugin_installation%': 1, 396 'enable_plugin_installation%': 1,
397 }], 397 }],
398 398
399 # linux_use_gold_binary: whether to use the binary checked into 399 # linux_use_gold_binary: whether to use the binary checked into
400 # third_party/gold. 400 # third_party/gold.
401 ['host_arch=="x64" and OS!="android"', { 401 ['OS=="linux"', {
402 'linux_use_gold_binary%': 1, 402 'linux_use_gold_binary%': 1,
403 }, { 403 }, {
404 'linux_use_gold_binary%': 0, 404 'linux_use_gold_binary%': 0,
405 }], 405 }],
406 406
407 # linux_use_gold_flags: whether to use build flags that rely on gold. 407 # linux_use_gold_flags: whether to use build flags that rely on gold.
408 # On by default for x64 Linux. Temporarily off for ChromeOS as 408 # On by default for x64 Linux. Temporarily off for ChromeOS as
409 # it failed on a buildbot. 409 # it failed on a buildbot.
410 ['host_arch=="x64" and chromeos==0 and OS!="android"', { 410 ['OS=="linux" and chromeos==0', {
411 'linux_use_gold_flags%': 1, 411 'linux_use_gold_flags%': 1,
412 }, { 412 }, {
413 'linux_use_gold_flags%': 0, 413 'linux_use_gold_flags%': 0,
414 }], 414 }],
415 ], 415 ],
416 }, 416 },
417 417
418 # Copy conditionally-set variables out one scope. 418 # Copy conditionally-set variables out one scope.
419 'branding%': '<(branding)', 419 'branding%': '<(branding)',
420 'buildtype%': '<(buildtype)', 420 'buildtype%': '<(buildtype)',
(...skipping 2454 matching lines...) Expand 10 before | Expand all | Expand 10 after
2875 # settings in target dicts. SYMROOT is a special case, because many other 2875 # settings in target dicts. SYMROOT is a special case, because many other
2876 # Xcode variables depend on it, including variables such as 2876 # Xcode variables depend on it, including variables such as
2877 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2877 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2878 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2878 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2879 # files to appear (when present) in the UI as actual files and not red 2879 # files to appear (when present) in the UI as actual files and not red
2880 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2880 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2881 # and therefore SYMROOT, needs to be set at the project level. 2881 # and therefore SYMROOT, needs to be set at the project level.
2882 'SYMROOT': '<(DEPTH)/xcodebuild', 2882 'SYMROOT': '<(DEPTH)/xcodebuild',
2883 }, 2883 },
2884 } 2884 }
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