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

Unified 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, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index cfe0d76e44b1b8bf5a8570164495abd6adbc2745..02844830b97eed639f4e960ba004d8875c57c737 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -4770,7 +4770,7 @@
],
},
}],
- ['clang==1', {
+ ['clang==1 and OS!="win"', {
'make_global_settings': [
['CC', '<(make_clang_dir)/bin/clang'],
['CXX', '<(make_clang_dir)/bin/clang++'],
@@ -4778,6 +4778,12 @@
['CXX.host', '$(CXX)'],
],
}],
+ ['clang==1 and OS=="win"', {
+ 'make_global_settings': [
+ # On Windows, gyp's ninja generator only looks at CC.
+ ['CC', '<(make_clang_dir)/bin/clang-cl'],
+ ],
+ }],
['OS=="android" and clang==0', {
# Hardcode the compiler names in the Makefile so that
# it won't depend on the environment at make time.
« 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