| Index: third_party/sqlite/BUILD.gn
|
| diff --git a/third_party/sqlite/BUILD.gn b/third_party/sqlite/BUILD.gn
|
| index 602a84f48eb9d620b7d133213469c8e8900714e0..2cc12d2b6a3444cafc2caa8ac2bfc5aa628c6435 100644
|
| --- a/third_party/sqlite/BUILD.gn
|
| +++ b/third_party/sqlite/BUILD.gn
|
| @@ -10,6 +10,7 @@ source_set("sqlite") {
|
| sources = [
|
| "amalgamation/sqlite3.h",
|
| "amalgamation/sqlite3.c",
|
| +
|
| # fts2.c currently has a lot of conflicts when added to
|
| # the amalgamation. It is probably not worth fixing that.
|
| "src/ext/fts2/fts2.c",
|
| @@ -81,6 +82,7 @@ source_set("sqlite") {
|
| cflags += [
|
| # sqlite does `if (*a++ && *b++);` in a non-buggy way.
|
| "-Wno-empty-body",
|
| +
|
| # sqlite has some `unsigned < 0` checks.
|
| "-Wno-tautological-compare",
|
| ]
|
| @@ -98,6 +100,7 @@ if (is_linux) {
|
| sources = [
|
| "src/src/shell.c",
|
| "src/src/shell_icu_linux.c",
|
| +
|
| # Include a dummy c++ file to force linking of libstdc++.
|
| "build_as_cpp.cc",
|
| ]
|
| @@ -111,7 +114,11 @@ if (is_linux) {
|
|
|
| if (is_ios) {
|
| source_set("sqlite_regexp") {
|
| - sources = [ "src/ext/icu/icu.c" ]
|
| - deps = [ "//third_party/icu" ]
|
| + sources = [
|
| + "src/ext/icu/icu.c",
|
| + ]
|
| + deps = [
|
| + "//third_party/icu",
|
| + ]
|
| }
|
| }
|
|
|