diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-15 03:58:11 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-15 03:58:11 +0000 |
| commit | e1ece30375b913301c3a1c85abe13e3ef51a0f44 (patch) | |
| tree | 0486298c86f1cf4ed2b3b74a0357394d9f962cdb /build/common.gypi | |
| parent | 8382d8c59cf80194737995129c36caa780960564 (diff) | |
| download | chromium_src-e1ece30375b913301c3a1c85abe13e3ef51a0f44.zip chromium_src-e1ece30375b913301c3a1c85abe13e3ef51a0f44.tar.gz chromium_src-e1ece30375b913301c3a1c85abe13e3ef51a0f44.tar.bz2 | |
mac: Switch the default compiler to clang for everyone.
Also commit http://codereview.chromium.org/7890052/ as part of this CL,
so that new pch files are created for clang automatically.
BUG=none
TEST=devs get happier, not too many bots break
Review URL: http://codereview.chromium.org/7843002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/build/common.gypi b/build/common.gypi index d5bd6d2..242fb17 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -561,6 +561,8 @@ }], # os_posix==1 and OS!="mac" ['OS=="mac"', { + # Enable clang on mac by default! + 'clang%': 1, 'conditions': [ # mac_product_name is set to the name of the .app bundle as it should # appear on disk. This duplicates data from @@ -579,14 +581,6 @@ ['branding=="Chrome" and buildtype=="Official"', { 'mac_breakpad%': 1, 'mac_keystone%': 1, - - # Official builds use clang, but only on m15+. Since there's just - # one buildbot config for the builder for m13, m14, and m15, this - # can't be defined in the buildbot config but is instead defined - # here (it was added after the m14 branch was cut). This is in the - # buildtype=="Official" section so that developers don't see it - # for their local builds. - 'clang%': 1, }, { # else: branding!="Chrome" or buildtype!="Official" 'mac_breakpad%': 0, 'mac_keystone%': 0, @@ -1660,6 +1654,8 @@ # MACOSX_DEPLOYMENT_TARGET maps to -mmacosx-version-min 'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)', 'PREBINDING': 'NO', # No -Wl,-prebind + # Keep pch files below xcodebuild/. + 'SHARED_PRECOMPS_DIR': '$(CONFIGURATION_BUILD_DIR)/SharedPrecompiledHeaders', 'USE_HEADERMAP': 'NO', 'OTHER_CFLAGS': [ '-fno-strict-aliasing', # See http://crbug.com/32204 |