Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Unified Diff: third_party/sqlite/src/Makefile.linux-gcc

Issue 949043002: Add //third_party/sqlite to dirs_to_snapshot, remove net_sql.patch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/sqlite/src/Makefile.in ('k') | third_party/sqlite/src/Makefile.msc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/sqlite/src/Makefile.linux-gcc
diff --git a/third_party/sqlite/src/Makefile.linux-gcc b/third_party/sqlite/src/Makefile.linux-gcc
index dca360e8bb5c542689c6d954be25fd7cca6e04dd..026c03cc6a85ed1ea529fdc0d8acc8ae4a4990e8 100644
--- a/third_party/sqlite/src/Makefile.linux-gcc
+++ b/third_party/sqlite/src/Makefile.linux-gcc
@@ -32,19 +32,23 @@ USLEEP = -DHAVE_USLEEP=1
# multi-threaded program, then define the following macro
# appropriately:
#
-#THREADSAFE = -DTHREADSAFE=1
THREADSAFE = -DTHREADSAFE=1
+#THREADSAFE = -DTHREADSAFE=0
#### Specify any extra linker options needed to make the library
# thread safe
#
-#THREADLIB = -lpthread
THREADLIB = -lpthread
+#THREADLIB =
#### Specify any extra libraries needed to access required functions.
#
#TLIBS = -lrt # fdatasync on Solaris 8
-TLIBS =
+ifeq ($(shell uname -s),Darwin)
+TLIBS = -framework CoreServices
+else
+TLIBS = -ldl
+endif
#### Leave SQLITE_DEBUG undefined for maximum speed. Use SQLITE_DEBUG=1
# to check for memory leaks. Use SQLITE_DEBUG=2 to print a log of all
@@ -57,10 +61,11 @@ TLIBS =
#OPTS = -DSQLITE_DEBUG=2
#OPTS = -DSQLITE_DEBUG=1
#OPTS =
+OPTS = -DNDEBUG=1
+#OPTS += -DHAVE_FDATASYNC=1
-# These flags match those for SQLITE_CFLAGS in config.mk.
+# These flags match those for SQLITE_CFLAGS in config.mk.
-OPTS += -DNDEBUG
OPTS += -DSQLITE_CORE
OPTS += -DSQLITE_ENABLE_FTS2 -DSQLITE_ENABLE_BROKEN_FTS2
OPTS += -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600
@@ -75,11 +80,20 @@ OPTS += -DSQLITE_MEMDEBUG=1
# -DSQLITE_OMIT_VACUUM=1 \
# -DSQLITE_TRANSACTION_DEFAULT_IMMEDIATE=1 \
-SHELL_ICU = $(TOP)/src/shell_icu_linux.c -licuuc
-
# TODO(shess) I can't see why I need this setting.
OPTS += -DOS_UNIX=1
+# The recover virtual table is not generally enabled. Enable it for testing
+# purposes.
+OPTS += -DDEFAULT_ENABLE_RECOVER=1
+
+# Support for loading Chromium ICU data in sqlite3.
+ifeq ($(shell uname -s),Darwin)
+SHELL_ICU =
+else
+SHELL_ICU = $(TOP)/src/shell_icu_linux.c -licuuc
+endif
+
#### The suffix to add to executable files. ".exe" for windows.
# Nothing for unix.
#
@@ -90,7 +104,7 @@ EXE =
# will run on the target platform. This is usually the same
# as BCC, unless you are cross-compiling.
#
-TCC = gcc -O6
+TCC = gcc -Os
#TCC = gcc -g -O0 -Wall
#TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
#TCC = /opt/mingw/bin/i386-mingw32-gcc -O6
« no previous file with comments | « third_party/sqlite/src/Makefile.in ('k') | third_party/sqlite/src/Makefile.msc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698