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

Unified Diff: build/standalone.gypi

Issue 764803002: Set clang directory in gyp. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 6 years, 1 month 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/standalone.gypi
diff --git a/build/standalone.gypi b/build/standalone.gypi
index 6cc05993cd5e39d0af81460bb50691dcb53bdbf3..a42c741ab3065b6830d66a4bd423b7d647657f58 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -33,6 +33,7 @@
'includes': ['toolchain.gypi'],
'variables': {
'component%': 'static_library',
+ 'make_clang_dir%': '../third_party/llvm-build/Release+Asserts',
Michael Achenbach 2014/11/27 11:58:02 In common.gypi I saw the usages of <(DEPTH) but th
Jakob Kummerow 2014/11/27 12:44:14 Black magic. I would think that <(DEPTH) should wo
jochen (gone - plz use gerrit) 2014/11/27 15:07:57 we shouldn't use DEPTH here, it's only useful for
'asan%': 0,
'tsan%': 0,
'visibility%': 'hidden',
@@ -432,5 +433,20 @@
], # target_conditions
}, # target_defaults
}], # OS=="mac"
+ ['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) '
Michael Achenbach 2014/11/27 11:58:02 This is copied 1:1 from common.gypi
+ 'and OS!="win"', {
+ 'make_global_settings': [
+ ['CC', '<(make_clang_dir)/bin/clang'],
+ ['CXX', '<(make_clang_dir)/bin/clang++'],
+ ['CC.host', '$(CC)'],
+ ['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'],
+ ],
+ }],
],
}
« 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