diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-30 19:05:23 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-30 19:05:23 +0000 |
| commit | 4ef0386631a343328f43f6f2102715ff8c2f129a (patch) | |
| tree | c1fb12ab0229a394bdc9aff6fe37bde99e7fa9a2 /third_party | |
| parent | fb1b5e118e48d32d8697f54f2fe64962b67c0686 (diff) | |
| download | chromium_src-4ef0386631a343328f43f6f2102715ff8c2f129a.zip chromium_src-4ef0386631a343328f43f6f2102715ff8c2f129a.tar.gz chromium_src-4ef0386631a343328f43f6f2102715ff8c2f129a.tar.bz2 | |
Revert 119307 - Revert 117996 and 117998 (clang warning flag fiddling).
These were causing some compiles to hang.
BUG=111208
TEST=Compilation terminates.
Review URL: https://chromiumcodereview.appspot.com/9169090
TBR=rsleevi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9303004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libxml/libxml.gyp | 14 | ||||
| -rw-r--r-- | third_party/libxslt/libxslt.gyp | 11 | ||||
| -rw-r--r-- | third_party/sqlite/sqlite.gyp | 14 |
3 files changed, 39 insertions, 0 deletions
diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp index 56ba94f..27b8b14 100644 --- a/third_party/libxml/libxml.gyp +++ b/third_party/libxml/libxml.gyp @@ -192,6 +192,20 @@ }, { # else: OS!="win" 'product_name': 'xml2', }], + ['clang == 1', { + 'xcode_settings': { + 'WARNING_CFLAGS': [ + # libxml passes `const unsigned char*` through `const char*`. + '-Wno-pointer-sign', + # libxml converts xmlSchemaValType to xmlSchemaTypeType. + '-Wno-conversion', + ], + }, + 'cflags': [ + '-Wno-pointer-sign', + '-Wno-conversion', + ], + }], ], }], ], diff --git a/third_party/libxslt/libxslt.gyp b/third_party/libxslt/libxslt.gyp index 4ac5e6c..dea6ae8 100644 --- a/third_party/libxslt/libxslt.gyp +++ b/third_party/libxslt/libxslt.gyp @@ -108,6 +108,17 @@ }, 'conditions': [ ['OS!="win"', {'product_name': 'xslt'}], + ['clang == 1', { + 'xcode_settings': { + 'WARNING_CFLAGS': [ + # libxslt stores a char[3] in a `const unsigned char*`. + '-Wno-pointer-sign', + ], + }, + 'cflags': [ + '-Wno-pointer-sign', + ], + }], ], }], ], diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp index 7f9bdba..6c4316b 100644 --- a/third_party/sqlite/sqlite.gyp +++ b/third_party/sqlite/sqlite.gyp @@ -118,6 +118,20 @@ '-Wno-pointer-to-int-cast', ], }], + ['clang==1', { + 'xcode_settings': { + 'WARNING_CFLAGS': [ + # sqlite does `if (*a++ && *b++);` in a non-buggy way. + '-Wno-empty-body', + # sqlite has some `unsigned < 0` checks. + '-Wno-tautological-compare', + ], + }, + 'cflags': [ + '-Wno-empty-body', + '-Wno-tautological-compare', + ], + }], ], }], ], |