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

sqlite: Build option tweaks.

This CL:
* Adds SQLITE_OMIT_COMPLETE, removing command auto-completion logic
* Adds SQLITE_HAVE_ISNAN, removing SQLite's custom implementation
* Removes -ldl, which was only needed for runtime extension loading

Change-Id: I065c2faba028379e336b2d691afad7093328d7c3
Reviewed-on: https://chromium-review.googlesource.com/1146290
Commit-Queue: Victor Costan <pwnall@chromium.org>
Reviewed-by: default avatarChris Mumford <cmumford@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577382}
parent e8a2d456
...@@ -91,6 +91,12 @@ config("chromium_sqlite3_compile_options") { ...@@ -91,6 +91,12 @@ config("chromium_sqlite3_compile_options") {
# Chromium calls sqlite3_reset() correctly to reset prepared statements. # Chromium calls sqlite3_reset() correctly to reset prepared statements.
"SQLITE_OMIT_AUTORESET", "SQLITE_OMIT_AUTORESET",
# Chrome doesn't ship the SQLite shell, so command auto-completion is not
# needed. Chrome developers who build the SQLite shell living at
# //third_party/sqlite:sqlite_shell for diagnostic purposes will have to
# live without auto-completion.
"SQLITE_OMIT_COMPLETE",
# Chrome does not use sqlite3_column_decltype(). # Chrome does not use sqlite3_column_decltype().
"SQLITE_OMIT_DECLTYPE", "SQLITE_OMIT_DECLTYPE",
...@@ -110,8 +116,8 @@ config("chromium_sqlite3_compile_options") { ...@@ -110,8 +116,8 @@ config("chromium_sqlite3_compile_options") {
# Chromium doesn't use sqlite3_{profile,trace}(). # Chromium doesn't use sqlite3_{profile,trace}().
"SQLITE_OMIT_TRACE", "SQLITE_OMIT_TRACE",
# TODO(pwnall): Add SQLITE_OMIT_COMPLETE when we import a SQLite release # Uses isnan() in the C99 standard library.
# including https://www.sqlite.org/src/info/c3e816cca4ddf096 "SQLITE_HAVE_ISNAN",
] ]
# On OSX, SQLite has extra logic for detecting the use of network # On OSX, SQLite has extra logic for detecting the use of network
...@@ -258,9 +264,7 @@ component("chromium_sqlite3") { ...@@ -258,9 +264,7 @@ component("chromium_sqlite3") {
":sqlite_warnings", ":sqlite_warnings",
] ]
if (is_linux) { if (is_mac || is_ios) {
libs = [ "dl" ]
} else if (is_mac || is_ios) {
libs = [ "CoreFoundation.framework" ] libs = [ "CoreFoundation.framework" ]
if (!is_ios) { if (!is_ios) {
libs += [ "CoreServices.framework" ] libs += [ "CoreServices.framework" ]
......
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