summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-18 21:26:44 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-18 21:26:44 (GMT)
commitce4eb88be2eba12d5580bb22b48af3a0e915363b (patch)
tree558b0b16d53ce268a6c4287737bc95559103ad9d /BuildTools/SCons
parentc31ab7f87ea33b4e1de2ae28c3c9e5263de23b77 (diff)
downloadswift-ce4eb88be2eba12d5580bb22b48af3a0e915363b.zip
swift-ce4eb88be2eba12d5580bb22b48af3a0e915363b.tar.bz2
Disable compilation of SQLite.
Diffstat (limited to 'BuildTools/SCons')
-rw-r--r--BuildTools/SCons/SConstruct30
1 files changed, 15 insertions, 15 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index d2ffeb3..a7496f2 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -571,21 +571,21 @@ else :
conf.Finish()
# SQLite
-sqlite_conf_env = conf_env.Clone()
-sqlite_flags = {}
-if env.get("sqlite_libdir", None) :
- sqlite_flags["LIBPATH"] = [env["sqlite_libdir"]]
-if env.get("sqlite_includedir", None) :
- sqlite_flags["CPPPATH"] = [env["sqlite_includedir"]]
-sqlite_conf_env.MergeFlags(sqlite_flags)
-conf = Configure(sqlite_conf_env)
-if conf.CheckCHeader("sqlite3.h") and conf.CheckLib(env["sqlite_libname"]) :
- env["HAVE_SQLITE"] = 1
- env["SQLITE_FLAGS"] = { "LIBS": [env["sqlite_libname"]] }
- env["SQLITE_FLAGS"].update(sqlite_flags)
-else :
- env["SQLITE_BUNDLED"] = 1
-conf.Finish()
+#sqlite_conf_env = conf_env.Clone()
+#sqlite_flags = {}
+#if env.get("sqlite_libdir", None) :
+# sqlite_flags["LIBPATH"] = [env["sqlite_libdir"]]
+#if env.get("sqlite_includedir", None) :
+# sqlite_flags["CPPPATH"] = [env["sqlite_includedir"]]
+#sqlite_conf_env.MergeFlags(sqlite_flags)
+#conf = Configure(sqlite_conf_env)
+#if conf.CheckCHeader("sqlite3.h") and conf.CheckLib(env["sqlite_libname"]) :
+# env["HAVE_SQLITE"] = 1
+# env["SQLITE_FLAGS"] = { "LIBS": [env["sqlite_libname"]] }
+# env["SQLITE_FLAGS"].update(sqlite_flags)
+#else :
+# env["SQLITE_BUNDLED"] = 1
+#conf.Finish()
# Lua
env["LUA_BUNDLED"] = 1