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

Side by Side Diff: build/common.gypi

Issue 147083011: common.gypi: When clang=1 on Windows, set CC to clang-cl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Optional tweak Created 6 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
« 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 4752 matching lines...) Expand 10 before | Expand all | Expand 10 after
4763 # Don't warn about the "typedef 'foo' locally defined but not used" 4763 # Don't warn about the "typedef 'foo' locally defined but not used"
4764 # for gcc 4.8. 4764 # for gcc 4.8.
4765 # TODO: remove this flag once all builds work. See crbug.com/227506 4765 # TODO: remove this flag once all builds work. See crbug.com/227506
4766 ['gcc_version>=48', { 4766 ['gcc_version>=48', {
4767 'target_defaults': { 4767 'target_defaults': {
4768 'cflags': [ 4768 'cflags': [
4769 '-Wno-unused-local-typedefs', 4769 '-Wno-unused-local-typedefs',
4770 ], 4770 ],
4771 }, 4771 },
4772 }], 4772 }],
4773 ['clang==1', { 4773 ['clang==1 and OS!="win"', {
4774 'make_global_settings': [ 4774 'make_global_settings': [
4775 ['CC', '<(make_clang_dir)/bin/clang'], 4775 ['CC', '<(make_clang_dir)/bin/clang'],
4776 ['CXX', '<(make_clang_dir)/bin/clang++'], 4776 ['CXX', '<(make_clang_dir)/bin/clang++'],
4777 ['CC.host', '$(CC)'], 4777 ['CC.host', '$(CC)'],
4778 ['CXX.host', '$(CXX)'], 4778 ['CXX.host', '$(CXX)'],
4779 ], 4779 ],
4780 }], 4780 }],
4781 ['clang==1 and OS=="win"', {
4782 'make_global_settings': [
4783 # On Windows, gyp's ninja generator only looks at CC.
4784 ['CC', '<(make_clang_dir)/bin/clang-cl'],
4785 ],
4786 }],
4781 ['OS=="android" and clang==0', { 4787 ['OS=="android" and clang==0', {
4782 # Hardcode the compiler names in the Makefile so that 4788 # Hardcode the compiler names in the Makefile so that
4783 # it won't depend on the environment at make time. 4789 # it won't depend on the environment at make time.
4784 'make_global_settings': [ 4790 'make_global_settings': [
4785 ['CC', '<!(/bin/echo -n <(android_toolchain)/*-gcc)'], 4791 ['CC', '<!(/bin/echo -n <(android_toolchain)/*-gcc)'],
4786 ['CXX', '<!(/bin/echo -n <(android_toolchain)/*-g++)'], 4792 ['CXX', '<!(/bin/echo -n <(android_toolchain)/*-g++)'],
4787 ['CC.host', '<!(which gcc)'], 4793 ['CC.host', '<!(which gcc)'],
4788 ['CXX.host', '<!(which g++)'], 4794 ['CXX.host', '<!(which g++)'],
4789 ], 4795 ],
4790 }], 4796 }],
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
4872 # settings in target dicts. SYMROOT is a special case, because many other 4878 # settings in target dicts. SYMROOT is a special case, because many other
4873 # Xcode variables depend on it, including variables such as 4879 # Xcode variables depend on it, including variables such as
4874 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4880 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4875 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4881 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4876 # files to appear (when present) in the UI as actual files and not red 4882 # files to appear (when present) in the UI as actual files and not red
4877 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4883 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4878 # and therefore SYMROOT, needs to be set at the project level. 4884 # and therefore SYMROOT, needs to be set at the project level.
4879 'SYMROOT': '<(DEPTH)/xcodebuild', 4885 'SYMROOT': '<(DEPTH)/xcodebuild',
4880 }, 4886 },
4881 } 4887 }
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