Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-09-12 18:25:54 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-09-12 18:25:54 (GMT) |
| commit | 55a5d78d1e9e5c56173d13345e2b303422389737 (patch) | |
| tree | bc2e5c287464ee1c0c2258c2b7e8b458573b57b9 /BuildTools | |
| parent | 50c339268eea3dcba3f8b8c9c745975b12bbe152 (diff) | |
| download | swift-55a5d78d1e9e5c56173d13345e2b303422389737.zip swift-55a5d78d1e9e5c56173d13345e2b303422389737.tar.bz2 | |
Don't use SQLite in non-experimental.
Diffstat (limited to 'BuildTools')
| -rw-r--r-- | BuildTools/SCons/SConstruct | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index 3be4bd7..ff74073 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -358,21 +358,26 @@ else : env["LIBNATPMP_FLAGS"] = {} # 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"]) and not env.get("sqlite_force_bundled", False): - env["HAVE_SQLITE"] = 1 - env["SQLITE_FLAGS"] = { "LIBS": [env["sqlite_libname"]] } - env["SQLITE_FLAGS"].update(sqlite_flags) +if env["experimental"] : + 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"]) and not env.get("sqlite_force_bundled", False): + env["HAVE_SQLITE"] = 1 + env["SQLITE_FLAGS"] = { "LIBS": [env["sqlite_libname"]] } + env["SQLITE_FLAGS"].update(sqlite_flags) + else : + env["SQLITE_BUNDLED"] = 1 + env["SQLITE_ASYNC_BUNDLED"] = 1 + conf.Finish() else : - env["SQLITE_BUNDLED"] = 1 -conf.Finish() + env["SQLITE_FLAGS"] = {} + # Lua env["LUA_BUNDLED"] = 1 |