summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-10-28 20:43:05 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-10-28 20:43:05 (GMT)
commitefea21c130186552ed399577d271535a05ec9d01 (patch)
treed891786ae299b073c5bc6c5dd60d6cea573ebf9a /BuildTools
parentc3ce666e17edea2c67afc1ea282bf22c7345b978 (diff)
downloadswift-efea21c130186552ed399577d271535a05ec9d01.zip
swift-efea21c130186552ed399577d271535a05ec9d01.tar.bz2
Fixed SCons error.
Diffstat (limited to 'BuildTools')
-rw-r--r--BuildTools/SCons/SConstruct7
1 files changed, 5 insertions, 2 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 23bd973..e008140 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -324,10 +324,13 @@ conf.Finish()
# Boost
env["BOOST_FLAGS"] = {}
-boost_prefix = env.get("boost", None)
+boost_prefix = env["boost"] if isinstance(env["boost"], str) else None
if boost_prefix :
- env["BOOST_FLAGS"]["CPPPATH"] = [os.path.join(boost_prefix, "include")]
+ # FIXME: Only use the include flag that has the includes
+ env["BOOST_FLAGS"]["CPPPATH"] = [os.path.join(boost_prefix, "include"), os.path.join(boost_prefix)]
env["BOOST_FLAGS"]["LIBPATH"] = [os.path.join(boost_prefix, "lib")]
+ # Try to auto detect the suffix from the boost libraries
+
boost_env = conf_env.Clone()
boost_env.MergeFlags(env["BOOST_FLAGS"])
boost_conf = Configure(boost_env)