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

Side by Side Diff: build/common.gypi

Issue 9316002: linux: use an in-tree copy of gold by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 8 years, 10 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 | « DEPS ('k') | tools/licenses.py » ('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) 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 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 # Turn precompiled headers on by default for VS 2010. 385 # Turn precompiled headers on by default for VS 2010.
386 ['OS=="win" and MSVS_VERSION=="2010"', { 386 ['OS=="win" and MSVS_VERSION=="2010"', {
387 'chromium_win_pch%': 1 387 'chromium_win_pch%': 1
388 }], 388 }],
389 389
390 ['use_aura==1 or chromeos==1', { 390 ['use_aura==1 or chromeos==1', {
391 'enable_plugin_installation%': 0, 391 'enable_plugin_installation%': 0,
392 }, { 392 }, {
393 'enable_plugin_installation%': 1, 393 'enable_plugin_installation%': 1,
394 }], 394 }],
395
396 # Set to 0 to not use third_party/gold as the linker.
397 # On by default for x64 Linux. Off for ChromeOS as cross-compiling
398 # makes things complicated.
399 ['chromeos==0 and host_arch=="x64"', {
400 'linux_use_gold_binary%': 1,
401 }, {
402 'linux_use_gold_binary%': 0,
403 }],
395 ], 404 ],
396 }, 405 },
397 406
398 # Copy conditionally-set variables out one scope. 407 # Copy conditionally-set variables out one scope.
399 'branding%': '<(branding)', 408 'branding%': '<(branding)',
400 'buildtype%': '<(buildtype)', 409 'buildtype%': '<(buildtype)',
401 'target_arch%': '<(target_arch)', 410 'target_arch%': '<(target_arch)',
402 'host_arch%': '<(host_arch)', 411 'host_arch%': '<(host_arch)',
403 'library%': 'static_library', 412 'library%': 'static_library',
404 'toolkit_views%': '<(toolkit_views)', 413 'toolkit_views%': '<(toolkit_views)',
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 'safe_browsing%': '<(safe_browsing)', 455 'safe_browsing%': '<(safe_browsing)',
447 'input_speech%': '<(input_speech)', 456 'input_speech%': '<(input_speech)',
448 'notifications%': '<(notifications)', 457 'notifications%': '<(notifications)',
449 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 458 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
450 'asan%': '<(asan)', 459 'asan%': '<(asan)',
451 'order_text_section%': '<(order_text_section)', 460 'order_text_section%': '<(order_text_section)',
452 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)', 461 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)',
453 'enable_web_intents%': '<(enable_web_intents)', 462 'enable_web_intents%': '<(enable_web_intents)',
454 'enable_web_intents_tag%': '<(enable_web_intents_tag)', 463 'enable_web_intents_tag%': '<(enable_web_intents_tag)',
455 'enable_plugin_installation%': '<(enable_plugin_installation)', 464 'enable_plugin_installation%': '<(enable_plugin_installation)',
465 'linux_use_gold_binary%': '<(linux_use_gold_binary)',
456 'use_canvas_skia_skia%': '<(use_canvas_skia_skia)', 466 'use_canvas_skia_skia%': '<(use_canvas_skia_skia)',
457 # Whether to build for Wayland display server 467 # Whether to build for Wayland display server
458 'use_wayland%': 0, 468 'use_wayland%': 0,
459 469
460 # Use system yasm instead of bundled one. 470 # Use system yasm instead of bundled one.
461 'use_system_yasm%': 0, 471 'use_system_yasm%': 0,
462 472
463 # Default to enabled PIE; this is important for ASLR but we need to be 473 # Default to enabled PIE; this is important for ASLR but we need to be
464 # able to turn it off for remote debugging on Chromium OS 474 # able to turn it off for remote debugging on Chromium OS
465 'linux_disable_pie%': 0, 475 'linux_disable_pie%': 0,
(...skipping 1527 matching lines...) Expand 10 before | Expand all | Expand 10 after
1993 'variables': {'linux_use_tcmalloc%': 1}, 2003 'variables': {'linux_use_tcmalloc%': 1},
1994 'defines': ['USE_HEAPCHECKER'], 2004 'defines': ['USE_HEAPCHECKER'],
1995 }], 2005 }],
1996 ['linux_use_tcmalloc==0', { 2006 ['linux_use_tcmalloc==0', {
1997 'defines': ['NO_TCMALLOC'], 2007 'defines': ['NO_TCMALLOC'],
1998 }], 2008 }],
1999 ['linux_keep_shadow_stacks==1', { 2009 ['linux_keep_shadow_stacks==1', {
2000 'defines': ['KEEP_SHADOW_STACKS'], 2010 'defines': ['KEEP_SHADOW_STACKS'],
2001 'cflags': ['-finstrument-functions'], 2011 'cflags': ['-finstrument-functions'],
2002 }], 2012 }],
2013 ['linux_use_gold_binary==1', {
2014 'ldflags': [
2015 # Put our gold binary in the search path for the linker.
2016 '-Bthird_party/gold',
Nico 2012/01/31 22:24:10 Do 'variables': { 'gold_path': 'third_party/gol
2017 ],
2018 }],
2003 ], 2019 ],
2004 }, 2020 },
2005 }], 2021 }],
2006 # FreeBSD-specific options; note that most FreeBSD options are set above, 2022 # FreeBSD-specific options; note that most FreeBSD options are set above,
2007 # with Linux. 2023 # with Linux.
2008 ['OS=="freebsd"', { 2024 ['OS=="freebsd"', {
2009 'target_defaults': { 2025 'target_defaults': {
2010 'ldflags': [ 2026 'ldflags': [
2011 '-Wl,--no-keep-memory', 2027 '-Wl,--no-keep-memory',
2012 ], 2028 ],
(...skipping 735 matching lines...) Expand 10 before | Expand all | Expand 10 after
2748 # settings in target dicts. SYMROOT is a special case, because many other 2764 # settings in target dicts. SYMROOT is a special case, because many other
2749 # Xcode variables depend on it, including variables such as 2765 # Xcode variables depend on it, including variables such as
2750 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2766 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2751 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2767 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2752 # files to appear (when present) in the UI as actual files and not red 2768 # files to appear (when present) in the UI as actual files and not red
2753 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2769 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2754 # and therefore SYMROOT, needs to be set at the project level. 2770 # and therefore SYMROOT, needs to be set at the project level.
2755 'SYMROOT': '<(DEPTH)/xcodebuild', 2771 'SYMROOT': '<(DEPTH)/xcodebuild',
2756 }, 2772 },
2757 } 2773 }
OLDNEW
« no previous file with comments | « DEPS ('k') | tools/licenses.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698