Commit aff02774 authored by Victor Costan's avatar Victor Costan Committed by Commit Bot

sqlite: Enable building sqlite_shell on Mac.

This shell is built against Chrome's build of SQLite, which uses special
build flags. The shell can be useful for debugging SQLite bugs.

Change-Id: I5ac92c5f8be544743cd4987e8c13b00e4c817b36
Reviewed-on: https://chromium-review.googlesource.com/c/1340363Reviewed-by: default avatarJoshua Bell <jsbell@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609434}
parent 5ee777f6
......@@ -553,7 +553,6 @@ group("gn_all") {
"//media/cast:tap_proxy",
"//skia:filter_fuzz_stub",
"//skia:image_operations_bench",
"//third_party/sqlite:sqlite_shell",
"//ui/snapshot:snapshot_unittests",
]
......@@ -669,6 +668,10 @@ group("gn_all") {
deps += [ "//third_party/perfetto:all" ]
}
if (is_mac || is_linux) {
deps += [ "//third_party/sqlite:sqlite_shell" ]
}
if (is_linux && !is_chromeos && !is_chromecast) {
# TODO(GYP): Figure out if any of these should be in gn_all
# and figure out how cross-platform they are
......
......@@ -345,7 +345,7 @@ group("sqlite") {
]
}
if (is_linux) {
if (is_linux || is_mac) {
executable("sqlite_shell") {
include_dirs = [
# shell.c contains an '#include "sqlite3.h", which we want to be
......@@ -355,12 +355,21 @@ if (is_linux) {
sources = [
"amalgamation/shell/shell.c",
"src/src/shell_icu_linux.c",
# Include a dummy c++ file to force linking of libstdc++.
"build_as_cpp.cc",
]
if (is_linux) {
sources += [ "src/src/shell_icu_linux.c" ]
}
# TODO(pwnall): Re-enable the shell on Windows when compilation errors are
# fixed upstream.
if (is_win) {
sources += [ "src/src/shell_icu_win.c" ]
}
deps = [
":sqlite",
"//third_party/icu",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment