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

Side by Side Diff: build/common.gypi

Issue 1273053003: build: Use lld-link instead of lld-link2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 5984 matching lines...) Expand 10 before | Expand all | Expand 10 after
5995 ], 5995 ],
5996 }], 5996 }],
5997 ['clang==1 and OS=="win"', { 5997 ['clang==1 and OS=="win"', {
5998 'make_global_settings': [ 5998 'make_global_settings': [
5999 # On Windows, gyp's ninja generator only looks at CC. 5999 # On Windows, gyp's ninja generator only looks at CC.
6000 ['CC', '<(make_clang_dir)/bin/clang-cl'], 6000 ['CC', '<(make_clang_dir)/bin/clang-cl'],
6001 ], 6001 ],
6002 }], 6002 }],
6003 ['use_lld==1 and OS=="win"', { 6003 ['use_lld==1 and OS=="win"', {
6004 'make_global_settings': [ 6004 'make_global_settings': [
6005 # Limited to Windows because -flavor link2 is the driver that is 6005 # Limited to Windows because lld-link is the driver that is
6006 # compatible with link.exe. 6006 # compatible with link.exe.
6007 ['LD', '<(make_clang_dir)/bin/lld -flavor link2'], 6007 ['LD', '<(make_clang_dir)/bin/lld-link'],
6008 ], 6008 ],
6009 }], 6009 }],
6010 ['OS=="android" and clang==0', { 6010 ['OS=="android" and clang==0', {
6011 # Hardcode the compiler names in the Makefile so that 6011 # Hardcode the compiler names in the Makefile so that
6012 # it won't depend on the environment at make time. 6012 # it won't depend on the environment at make time.
6013 'make_global_settings': [ 6013 'make_global_settings': [
6014 ['CC', '<!(/bin/echo -n <(android_toolchain)/*-gcc)'], 6014 ['CC', '<!(/bin/echo -n <(android_toolchain)/*-gcc)'],
6015 ['CXX', '<!(/bin/echo -n <(android_toolchain)/*-g++)'], 6015 ['CXX', '<!(/bin/echo -n <(android_toolchain)/*-g++)'],
6016 ['CC.host', '<(host_cc)'], 6016 ['CC.host', '<(host_cc)'],
6017 ['CXX.host', '<(host_cxx)'], 6017 ['CXX.host', '<(host_cxx)'],
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
6305 # settings in target dicts. SYMROOT is a special case, because many other 6305 # settings in target dicts. SYMROOT is a special case, because many other
6306 # Xcode variables depend on it, including variables such as 6306 # Xcode variables depend on it, including variables such as
6307 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6307 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6308 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6308 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6309 # files to appear (when present) in the UI as actual files and not red 6309 # files to appear (when present) in the UI as actual files and not red
6310 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6310 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6311 # and therefore SYMROOT, needs to be set at the project level. 6311 # and therefore SYMROOT, needs to be set at the project level.
6312 'SYMROOT': '<(DEPTH)/xcodebuild', 6312 'SYMROOT': '<(DEPTH)/xcodebuild',
6313 }, 6313 },
6314 } 6314 }
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