Chromium Code Reviews| Index: third_party/sqlite/BUILD.gn |
| diff --git a/third_party/sqlite/BUILD.gn b/third_party/sqlite/BUILD.gn |
| index 92d0d881abcb183ddbe38a3cf9dc01161b568b50..ac14a2cf06e56ffa843a40ea8abaee6ef5cd6b61 100644 |
| --- a/third_party/sqlite/BUILD.gn |
| +++ b/third_party/sqlite/BUILD.gn |
| @@ -14,6 +14,27 @@ if (!use_system_sqlite) { |
| include_dirs = [ "." ] |
| } |
| + config("sqlite_warnings") { |
| + cflags = [] |
| + if (is_clang) { |
| + # sqlite contains a few functions that are unused, at least on |
| + # Windows with Chromium's sqlite patches applied |
| + # (interiorCursorEOF fts3EvalDeferredPhrase |
| + # fts3EvalSelectDeferred sqlite3Fts3InitHashTable |
| + # sqlite3Fts3InitTok). |
| + cflags += [ "-Wno-unused-function" ] |
| + } |
| + if (is_linux) { |
| + cflags += [ |
| + # SQLite doesn"t believe in compiler warnings, |
| + # preferring testing. |
| + # http://www.sqlite.org/faq.html#q17 |
| + "-Wno-int-to-pointer-cast", |
| + "-Wno-pointer-to-int-cast", |
| + ] |
| + } |
| + } |
| + |
| source_set("sqlite") { |
| sources = [ |
| "amalgamation/sqlite3.c", |
| @@ -57,26 +78,6 @@ if (!use_system_sqlite) { |
| include_dirs = [ "amalgamation" ] |
| - config("sqlite_warnings") { |
| - cflags = [] |
| - if (is_clang) { |
| - # sqlite contains a few functions that are unused, at least on |
| - # Windows with Chromium's sqlite patches applied |
| - # (interiorCursorEOF fts3EvalDeferredPhrase |
| - # fts3EvalSelectDeferred sqlite3Fts3InitHashTable |
| - # sqlite3Fts3InitTok). |
| - cflags += [ "-Wno-unused-function" ] |
| - } |
| - if (is_linux) { |
| - cflags += [ |
| - # SQLite doesn"t believe in compiler warnings, |
| - # preferring testing. |
| - # http://www.sqlite.org/faq.html#q17 |
| - "-Wno-int-to-pointer-cast", |
| - "-Wno-pointer-to-int-cast", |
| - ] |
| - } |
| - } |
| configs -= [ "//build/config/compiler:chromium_code" ] |
| configs += [ "//build/config/compiler:no_chromium_code" ] |
| configs += [ ":sqlite_warnings" ] |
|
Nico
2015/09/02 17:05:36
you merged no_chromium_code and the :local_warning
|