aboutsummaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authorYi Kong <yikong@google.com>2017-12-06 19:56:34 -0800
committerYi Kong <yikong@google.com>2018-02-01 10:23:32 -0800
commit599a6032fce6ec14834785aadc1c73db80763fc6 (patch)
treef3df3728b5eac38fc98682ae493c4890d64e79ef /cc
parent03d383d038c867ca0430460f9341da6eca8d4d2b (diff)
downloadbuild_soong-599a6032fce6ec14834785aadc1c73db80763fc6.tar.gz
build_soong-599a6032fce6ec14834785aadc1c73db80763fc6.tar.bz2
build_soong-599a6032fce6ec14834785aadc1c73db80763fc6.zip
Switch to clang-4579689.
Bug: 68397894 Test: http://go/clang-4523590-testing Change-Id: Ief806250572fe2cc5f39b4c47ff74863acbbb26d
Diffstat (limited to 'cc')
-rw-r--r--cc/config/clang.go13
-rw-r--r--cc/config/global.go4
2 files changed, 15 insertions, 2 deletions
diff --git a/cc/config/clang.go b/cc/config/clang.go
index 302c68ee..004840ad 100644
--- a/cc/config/clang.go
+++ b/cc/config/clang.go
@@ -148,6 +148,19 @@ func init() {
// fixed.
//"-Werror=null-dereference",
"-Werror=return-type",
+
+ // http://b/72331526 Disable -Wtautological-* until the instances detected by these
+ // new warnings are fixed.
+ "-Wno-error=tautological-constant-compare",
+
+ // http://b/72331524 Allow null pointer arithmetic until the instances detected by
+ // this new warning are fixed.
+ "-Wno-error=null-pointer-arithmetic",
+
+ // http://b/72330874 Disable -Wenum-compare until the instances detected by this new
+ // warning are fixed.
+ "-Wno-error=enum-compare",
+ "-Wno-error=enum-compare-switch",
}, " "))
}
diff --git a/cc/config/global.go b/cc/config/global.go
index 37848247..55ae9e36 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -116,8 +116,8 @@ var (
// prebuilts/clang default settings.
ClangDefaultBase = "prebuilts/clang/host"
- ClangDefaultVersion = "clang-4393122"
- ClangDefaultShortVersion = "5.0.1"
+ ClangDefaultVersion = "clang-4579689"
+ ClangDefaultShortVersion = "6.0.1"
// Directories with warnings from Android.bp files.
WarningAllowedProjects = []string{