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

Side by Side Diff: build/common.gypi

Issue 196573022: Use gold from third_party/binutils rather then third_party/gold. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing tab. Created 6 years, 8 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) 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 1321 matching lines...) Expand 10 before | Expand all | Expand 10 after
1332 # Set to 1 to compile with the hole punching for the protected video. 1332 # Set to 1 to compile with the hole punching for the protected video.
1333 'video_hole%': 0, 1333 'video_hole%': 0,
1334 1334
1335 'conditions': [ 1335 'conditions': [
1336 # Enable the Syzygy optimization step for the official builds. 1336 # Enable the Syzygy optimization step for the official builds.
1337 ['OS=="win" and buildtype=="Official" and syzyasan!=1', { 1337 ['OS=="win" and buildtype=="Official" and syzyasan!=1', {
1338 'syzygy_optimize%': 1, 1338 'syzygy_optimize%': 1,
1339 }, { 1339 }, {
1340 'syzygy_optimize%': 0, 1340 'syzygy_optimize%': 0,
1341 }], 1341 }],
1342 1342 # Get binutils version so we can enable debug fission if we can.
1343 ['os_posix==1 and OS!="mac" and OS!="ios"', {
1344 'binutils_version%': '<!(python <(DEPTH)/build/compiler_version.py assem bler)',
1345 'conditions': [
1346 # On Android we know the binutils version in the toolchain.
1347 ['OS=="android"', {
1348 'binutils_version%': 222,
Lei Zhang 2014/04/03 23:00:01 In this case, since we already know, should this o
mithro-old 2014/04/04 03:36:28 Done.
1349 }],
1350 # Our version of binutils in third_party/binutils
1351 ['linux_use_gold_binary==1', {
1352 'binutils_version%': 224,
1353 'conditions': [
1354 ['host_arch=="x64"', {
1355 'binutils_dir%': 'third_party/binutils/Linux_x64/Release',
Lei Zhang 2014/04/03 23:00:01 Since there will always be a Release component in
mithro-old 2014/04/04 03:36:28 Done.
1356 }],
1357 ['host_arch=="ia32"', {
1358 'binutils_dir%': 'third_party/binutils/Linux_ia32/Release',
1359 }],
1360 ],
1361 }],
1362 ],
1363 }, {
1364 'binutils_version%': 0,
1365 }],
1343 # The version of GCC in use, set later in platforms that use GCC and have 1366 # The version of GCC in use, set later in platforms that use GCC and have
1344 # not explicitly chosen to build with clang. Currently, this means all 1367 # not explicitly chosen to build with clang. Currently, this means all
1345 # platforms except Windows, Mac and iOS. 1368 # platforms except Windows, Mac and iOS.
1346 # TODO(glider): set clang to 1 earlier for ASan and TSan builds so that 1369 # TODO(glider): set clang to 1 earlier for ASan and TSan builds so that
1347 # it takes effect here. 1370 # it takes effect here.
1348 ['os_posix==1 and OS!="mac" and OS!="ios" and clang==0 and asan==0 and lsa n==0 and tsan==0 and msan==0', { 1371 ['os_posix==1 and OS!="mac" and OS!="ios" and clang==0 and asan==0 and lsa n==0 and tsan==0 and msan==0', {
1349 'conditions': [ 1372 'conditions': [
1350 ['OS=="android"', { 1373 ['OS=="android"', {
1351 # We directly set the gcc_version since we know what we use. 1374 # We directly set the gcc_version since we know what we use.
1352 'conditions': [ 1375 'conditions': [
1353 ['target_arch=="x64" or target_arch=="arm64"', { 1376 ['target_arch=="x64" or target_arch=="arm64"', {
1354 'gcc_version%': 48, 1377 'gcc_version%': 48,
1355 }, { 1378 }, {
1356 'gcc_version%': 46, 1379 'gcc_version%': 46,
1357 }], 1380 }],
1358 ], 1381 ],
1359 'binutils_version%': 222,
1360 }, { 1382 }, {
1361 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)', 1383 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
1362 'binutils_version%': '<!(python <(DEPTH)/build/compiler_version.py a ssembler)',
1363 }], 1384 }],
1364 ], 1385 ],
1365 }, { 1386 }, {
1366 'gcc_version%': 0, 1387 'gcc_version%': 0,
1367 'binutils_version%': 0,
1368 }], 1388 }],
1369 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_defa ult_path))"=="True"', { 1389 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_defa ult_path))"=="True"', {
1370 'windows_sdk_path%': '<(windows_sdk_default_path)', 1390 'windows_sdk_path%': '<(windows_sdk_default_path)',
1371 }, { 1391 }, {
1372 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0', 1392 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0',
1373 }], 1393 }],
1374 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_defa ult_path))"=="True"', { 1394 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_defa ult_path))"=="True"', {
1375 'directx_sdk_path%': '<(directx_sdk_default_path)', 1395 'directx_sdk_path%': '<(directx_sdk_default_path)',
1376 }, { 1396 }, {
1377 'directx_sdk_path%': '$(DXSDK_DIR)', 1397 'directx_sdk_path%': '$(DXSDK_DIR)',
(...skipping 2453 matching lines...) Expand 10 before | Expand all | Expand 10 after
3831 # now. 3851 # now.
3832 #'-Wl,--icf=safe', 3852 #'-Wl,--icf=safe',
3833 '-Wl,--icf=none', 3853 '-Wl,--icf=none',
3834 ], 3854 ],
3835 }], 3855 }],
3836 ], 3856 ],
3837 }], 3857 }],
3838 ], 3858 ],
3839 }], 3859 }],
3840 ['linux_use_gold_binary==1', { 3860 ['linux_use_gold_binary==1', {
3861 # Put our binutils, which contains gold in the search path. We pass
3862 # the path to gold to the compiler. gyp leaves unspecified what the
3863 # cwd is when running the compiler, so the normal gyp path-munging
3864 # fails us. This hack gets the right path.
3865 'cflags': [
3866 '-B<!(cd <(DEPTH) && pwd -P)/<(binutils_dir)/bin',
3867 ],
3841 'ldflags': [ 3868 'ldflags': [
3842 # Put our gold binary in the search path for the linker. 3869 '-B<!(cd <(DEPTH) && pwd -P)/<(binutils_dir)/bin',
3843 # We pass the path to gold to the compiler. gyp leaves
3844 # unspecified what the cwd is when running the compiler,
3845 # so the normal gyp path-munging fails us. This hack
3846 # gets the right path.
3847 '-B<!(cd <(DEPTH) && pwd -P)/third_party/gold',
3848 ], 3870 ],
3849 }], 3871 }],
3850 ], 3872 ],
3851 }, 3873 },
3852 }], 3874 }],
3853 # FreeBSD-specific options; note that most FreeBSD options are set above, 3875 # FreeBSD-specific options; note that most FreeBSD options are set above,
3854 # with Linux. 3876 # with Linux.
3855 ['OS=="freebsd"', { 3877 ['OS=="freebsd"', {
3856 'target_defaults': { 3878 'target_defaults': {
3857 'ldflags': [ 3879 'ldflags': [
(...skipping 1324 matching lines...) Expand 10 before | Expand all | Expand 10 after
5182 # settings in target dicts. SYMROOT is a special case, because many other 5204 # settings in target dicts. SYMROOT is a special case, because many other
5183 # Xcode variables depend on it, including variables such as 5205 # Xcode variables depend on it, including variables such as
5184 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5206 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5185 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5207 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5186 # files to appear (when present) in the UI as actual files and not red 5208 # files to appear (when present) in the UI as actual files and not red
5187 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5209 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5188 # and therefore SYMROOT, needs to be set at the project level. 5210 # and therefore SYMROOT, needs to be set at the project level.
5189 'SYMROOT': '<(DEPTH)/xcodebuild', 5211 'SYMROOT': '<(DEPTH)/xcodebuild',
5190 }, 5212 },
5191 } 5213 }
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