diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-10 18:01:57 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-10 18:01:57 +0000 |
| commit | 33668ca601ad1bfc193c9410097234d3e6bfa37f (patch) | |
| tree | ba87201ae19c0d1ed5176ab48c8fa2acbcafe840 /build | |
| parent | 05fbf80abcd9312a626c6f7ffade18704d903747 (diff) | |
| download | chromium_src-33668ca601ad1bfc193c9410097234d3e6bfa37f.zip chromium_src-33668ca601ad1bfc193c9410097234d3e6bfa37f.tar.gz chromium_src-33668ca601ad1bfc193c9410097234d3e6bfa37f.tar.bz2 | |
Hotfix to make clang-by-default work with gcc 4.8
A better fix is to set clang further up, so that gcc_version is set to
0 when clang is on automatically
( https://codereview.chromium.org/384633005 ). This is however blocked
on nacl also using the "clang" symbol, so that needs to be fixed first
( https://codereview.chromium.org/384793002 ). To make the build go for
people in the meantime, land this hack. I'll revert it once the nacl change has
landed in nacl and then rolled into chromium, and the better fix has landed.
BUG=360311
TBR=thestig@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/379693003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282377 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/build/common.gypi b/build/common.gypi index a091703..0b1ffd7 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -4193,7 +4193,7 @@ # gcc -- http://gcc.gnu.org/onlinedocs/gcc-4.8.0/gcc/Optimize-Options.html # TODO(mithro): Watch for clang support at following thread: # http://clang-developers.42468.n3.nabble.com/Adding-fuse-ld-support-to-clang-td4032180.html - ['gcc_version>=48', { + ['gcc_version>=48 and clang==0', { 'target_conditions': [ ['_toolset=="target"', { 'ldflags': [ @@ -4202,7 +4202,7 @@ }], ], }], - ['host_gcc_version>=48', { + ['host_gcc_version>=48 and clang==0', { 'target_conditions': [ ['_toolset=="host"', { 'ldflags': [ @@ -4240,7 +4240,7 @@ '-Wl,--disable-new-dtags', ], }], - ['gcc_version>=48', { + ['gcc_version>=48 and clang==0', { 'target_conditions': [ ['_toolset=="target"', { 'cflags_cc': [ @@ -4253,7 +4253,7 @@ }], ], }], - ['host_gcc_version>=48', { + ['host_gcc_version>=48 and clang==0', { 'target_conditions': [ ['_toolset=="host"', { 'cflags_cc': [ @@ -5487,7 +5487,7 @@ # Don't warn about the "typedef 'foo' locally defined but not used" # for gcc 4.8. # TODO: remove this flag once all builds work. See crbug.com/227506 - ['gcc_version>=48', { + ['gcc_version>=48 and clang==0', { 'target_defaults': { 'cflags': [ '-Wno-unused-local-typedefs', |