diff options
| -rw-r--r-- | build/common.gypi | 6 | ||||
| -rwxr-xr-x | tools/clang/scripts/update.sh | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 286aee1..8df35e0 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2367,6 +2367,9 @@ # Warns on switches on enums that cover all enum values but # also contain a default: branch. Chrome is full of that. '-Wno-covered-switch-default', + + # TODO(thakis): Remove this. + '-Wno-implicit-conversion-floating-point-to-bool', ], 'cflags!': [ # Clang doesn't seem to know know this flag. @@ -2872,6 +2875,9 @@ # Warns on switches on enums that cover all enum values but # also contain a default: branch. Chrome is full of that. '-Wno-covered-switch-default', + + # TODO(thakis): Remove this. + '-Wno-implicit-conversion-floating-point-to-bool', ], }], ['clang==1 and clang_use_chrome_plugins==1', { diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh index ae190e9..0359306 100755 --- a/tools/clang/scripts/update.sh +++ b/tools/clang/scripts/update.sh @@ -8,7 +8,7 @@ # Do NOT CHANGE this if you don't know what you're doing -- see # https://code.google.com/p/chromium/wiki/UpdatingClang # Reverting problematic clang rolls is safe, though. -CLANG_REVISION=161757 +CLANG_REVISION=163126 THIS_DIR="$(dirname "${0}")" LLVM_DIR="${THIS_DIR}/../../../third_party/llvm" |