Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-10-13 08:30:05 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-10-13 19:00:14 (GMT) |
| commit | 17ca89070f7f37f1c87f6694391b9671ba035661 (patch) | |
| tree | 5ae8924f651f84ba9e976689b327ac1753f83f8d /BuildTools | |
| parent | 2f6ab703ff580e49e15d37835fa25f414bcdcd56 (diff) | |
| download | swift-17ca89070f7f37f1c87f6694391b9671ba035661.zip swift-17ca89070f7f37f1c87f6694391b9671ba035661.tar.bz2 | |
Remove restriction to only detect Boost FileSystem v2.
Resolves: #1173
Change-Id: I79343bf8ff0d14528825699d8eee79985a09d29d
Diffstat (limited to 'BuildTools')
| -rw-r--r-- | BuildTools/SCons/SConstruct | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index 2e8d1cb..a0a6e8d 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -122,25 +122,24 @@ if conf.CheckLib("m") : if conf.CheckLib("c") : env["PLATFORM_FLAGS"]["LIBS"] = env["PLATFORM_FLAGS"].get("LIBS", []) + ["c"] if conf.CheckLib("stdc++") : env["PLATFORM_FLAGS"]["LIBS"] = env["PLATFORM_FLAGS"].get("LIBS", []) + ["stdc++"] conf.Finish() # Boost boost_conf_env = conf_env.Clone() boost_flags = {} -boost_flags["CPPDEFINES"] = [("BOOST_FILESYSTEM_VERSION", "2")] if env.get("boost_libdir", None) : boost_flags["LIBPATH"] = [env["boost_libdir"]] if env.get("boost_includedir", None) : if env["PLATFORM"] == "win32" : boost_flags["CPPPATH"] = [env["boost_includedir"]] else : # Using isystem to avoid getting warnings from a system boost # Unfortunately, this also disables dependency tracking boost_flags["CPPFLAGS"] = [("-isystem", env["boost_includedir"])] boost_conf_env.MergeFlags(boost_flags) conf = Configure(boost_conf_env) boostLibs = [("signals", None), ("thread", None), ("regex", None), ("program_options", None), ("filesystem", None), ("system", "system/system_error.hpp"), ("date_time", "date_time/date.hpp")] |