diff options
| author | sdefresne <sdefresne@chromium.org> | 2015-02-23 11:48:51 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-23 19:49:19 +0000 |
| commit | 3ea2d12051d9922ad4834c2efd19adfa1fe71cf1 (patch) | |
| tree | 3cf8717e79cc7b52d8057e3dcf97154e3ccac357 | |
| parent | f12bc2de97a0fbbbd85b493d34379c775a26875d (diff) | |
| download | chromium_src-3ea2d12051d9922ad4834c2efd19adfa1fe71cf1.zip chromium_src-3ea2d12051d9922ad4834c2efd19adfa1fe71cf1.tar.gz chromium_src-3ea2d12051d9922ad4834c2efd19adfa1fe71cf1.tar.bz2 | |
Use the version of clang shipped with Xcode for official build
Instead of checking which generator is used to decide whether to use
ToT clang or Xcode clang, make the decision based on the buildtype
instead.
Use the version of clang shipped with Xcode for official build, and
leave the default selected for developer builds (default to ToT clang).
BUG=459148
Review URL: https://codereview.chromium.org/936013002
Cr-Commit-Position: refs/heads/master@{#317627}
| -rw-r--r-- | build/common.gypi | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 55dad68..cf560ee 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2076,10 +2076,13 @@ 'host_os%': "mac", }], + # Use the version of clang shipped with Xcode when building official + # version of Chrome for iOS. + # # TODO(eugenebut): Remove enable_coverage check once # libclang_rt.profile_ios.a is bundled with Chromium's clang. # http://crbug.com/450379 - ['enable_coverage or "<(GENERATOR)"=="xcode"', { + ['buildtype=="Official" or enable_coverage', { 'clang_xcode%': 1, }], ], |