From 51ba15ad81819e1ffd66fd4e08ed3ae6b178ed45 Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Tue, 2 Jul 2013 15:13:24 +0000 Subject: [PATCH] roll clang 182481:184830 New stuff: - can parse gcc 4.7+ headers in gnu++11 mode - -Wheader-guards - -Wlogical-not-parentheses - Fixes http://llvm.org/PR15998 This is also the first time these binaries were built on precise (and as a consequence won't run on lucid). BUG=255201 R=hans@chromium.org Review URL: https://codereview.chromium.org/18124002 git-svn-id: http://src.chromium.org/svn/trunk/src/build@209703 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- common.gypi | 10 ++++++++++ linux/system.gyp | 9 +++++++++ 2 files changed, 19 insertions(+) diff --git a/common.gypi b/common.gypi index 12ada0e96..86d133de7 100644 --- a/common.gypi +++ b/common.gypi @@ -3129,6 +3129,11 @@ # suffix. However, this is used heavily in NaCl code, so disable # the warning for now. '-Wno-reserved-user-defined-literal', + + # Clang considers the `register` keyword as deprecated, but e.g. + # code generated by flex (used in angle) contains that keyword. + # http://crbug.com/255186 + '-Wno-deprecated-register', ], 'cflags_cc': [ # See the comment in the Mac section for what it takes to move @@ -3826,6 +3831,11 @@ # Warns when a const char[] is converted to bool. '-Wstring-conversion', + + # Clang considers the `register` keyword as deprecated, but e.g. + # code generated by flex (used in angle) contains that keyword. + # http://crbug.com/255186 + '-Wno-deprecated-register', ], 'OTHER_CPLUSPLUSFLAGS': [ # gnu++11 instead of c++11 is needed because some code uses diff --git a/linux/system.gyp b/linux/system.gyp index 867553fbf..32789a94e 100644 --- a/linux/system.gyp +++ b/linux/system.gyp @@ -241,6 +241,15 @@ ], }, }], + ['use_openssl==0 and clang==1', { + 'direct_dependent_settings': { + 'cflags': [ + # There is a broken header guard in /usr/include/nss/secmod.h: + # https://bugzilla.mozilla.org/show_bug.cgi?id=884072 + '-Wno-header-guard', + ], + }, + }], ] }], ],