diff options
| -rw-r--r-- | infra/bots/assets/clang_win/VERSION | 2 | ||||
| -rwxr-xr-x | infra/bots/assets/clang_win/create.py | 4 | ||||
| -rw-r--r-- | infra/bots/tasks.json | 12 | ||||
| -rw-r--r-- | third_party/angle2/BUILD.gn | 4 |
4 files changed, 13 insertions, 9 deletions
diff --git a/infra/bots/assets/clang_win/VERSION b/infra/bots/assets/clang_win/VERSION index c227083464..d8263ee986 100644 --- a/infra/bots/assets/clang_win/VERSION +++ b/infra/bots/assets/clang_win/VERSION @@ -1 +1 @@ -0
\ No newline at end of file +2
\ No newline at end of file diff --git a/infra/bots/assets/clang_win/create.py b/infra/bots/assets/clang_win/create.py index 0bb5388816..9b85378a91 100755 --- a/infra/bots/assets/clang_win/create.py +++ b/infra/bots/assets/clang_win/create.py @@ -16,8 +16,8 @@ import subprocess import utils -CLANG_REVISION = '308728' -CLANG_SUB_REVISION = '3' +CLANG_REVISION = '318667' +CLANG_SUB_REVISION = '1' CLANG_PKG_VERSION = '%s-%s' % (CLANG_REVISION, CLANG_SUB_REVISION) GS_URL = ('https://commondatastorage.googleapis.com/chromium-browser-clang' '/Win/clang-%s.tgz' % CLANG_PKG_VERSION) diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index fca724d63d..11de17b5a8 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -4700,7 +4700,7 @@ { "name": "skia/bots/clang_win", "path": "clang_win", - "version": "version:0" + "version": "version:2" } ], "dependencies": [ @@ -4733,7 +4733,7 @@ { "name": "skia/bots/clang_win", "path": "clang_win", - "version": "version:0" + "version": "version:2" } ], "dependencies": [ @@ -4766,7 +4766,7 @@ { "name": "skia/bots/clang_win", "path": "clang_win", - "version": "version:0" + "version": "version:2" } ], "dependencies": [ @@ -4800,7 +4800,7 @@ { "name": "skia/bots/clang_win", "path": "clang_win", - "version": "version:0" + "version": "version:2" } ], "dependencies": [ @@ -4833,7 +4833,7 @@ { "name": "skia/bots/clang_win", "path": "clang_win", - "version": "version:0" + "version": "version:2" } ], "dependencies": [ @@ -4866,7 +4866,7 @@ { "name": "skia/bots/clang_win", "path": "clang_win", - "version": "version:0" + "version": "version:2" } ], "dependencies": [ diff --git a/third_party/angle2/BUILD.gn b/third_party/angle2/BUILD.gn index c540bfa669..cb780c238d 100644 --- a/third_party/angle2/BUILD.gn +++ b/third_party/angle2/BUILD.gn @@ -63,6 +63,10 @@ config("common") { # Allow noexcept, even though we build without exceptions cflags_cc += [ "/wd4577" ] + if (is_clang) { + # utilities.cpp includes an 'unsigned long' <= UINT_MAX check + cflags_cc += [ "-Wno-tautological-constant-compare" ] + } } } |