diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 21:52:24 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 21:52:24 +0000 |
| commit | e4ddf3322190ac0560bd2fb28676270ba8228920 (patch) | |
| tree | f700e443845ae331921ba9535d0824069f2320e3 /build | |
| parent | 593ddfa5b36b3fcea4ba20b054f00338adb4caf3 (diff) | |
| download | chromium_src-e4ddf3322190ac0560bd2fb28676270ba8228920.zip chromium_src-e4ddf3322190ac0560bd2fb28676270ba8228920.tar.gz chromium_src-e4ddf3322190ac0560bd2fb28676270ba8228920.tar.bz2 | |
clang: Enable using a different compiler path for standalone webkit make builds.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8352029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106595 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/build/common.gypi b/build/common.gypi index aaecfdd..917c33c 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -489,9 +489,8 @@ # Set this to true when building with Clang. # See http://code.google.com/p/chromium/wiki/Clang for details. - # TODO: eventually clang should behave identically to gcc, and this - # won't be necessary. 'clang%': 0, + 'make_clang_dir%': 'third_party/llvm-build/Release+Asserts', # These two variables can be set in GYP_DEFINES while running # |gclient runhooks| to let clang run a plugin in every compilation. @@ -2540,8 +2539,8 @@ }], ['clang==1', { 'make_global_settings': [ - ['CC', 'third_party/llvm-build/Release+Asserts/bin/clang'], - ['CXX', 'third_party/llvm-build/Release+Asserts/bin/clang++'], + ['CC', '<(make_clang_dir)/bin/clang'], + ['CXX', '<(make_clang_dir)/bin/clang++'], ['LINK', '$(CXX)'], ['CC.host', '$(CC)'], ['CXX.host', '$(CXX)'], |