summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-04-19 07:27:49 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-04-19 07:28:04 (GMT)
commitcbdcaff914df208deefec4f5ff3a42f32e081a85 (patch)
tree4edac03fd7af9f69a78fcf426e281d7601bb8cb1 /Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript
parentb6e77a03685c8cca575c026b8b3ae5a86bb0f828 (diff)
downloadswift-contrib-cbdcaff914df208deefec4f5ff3a42f32e081a85.zip
swift-contrib-cbdcaff914df208deefec4f5ff3a42f32e081a85.tar.bz2
Don't build C++0x EchoBot on Linux for now.
Diffstat (limited to 'Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript')
-rw-r--r--Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript
index 036b29d..c6349bd 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript
@@ -16,7 +16,9 @@ if env["PLATFORM"] == "win32" :
cpp0x = True
else :
if env["CCVERSION"].split(".") >= ["4", "5", "0"] :
- cpp0x = True
+ # Temporarily disabling c++0x mode because of problems with boost::thread
+ # on some platforms
+ #cpp0x = True
cpp0x_env.Replace(CXXFLAGS = [flag for flag in env["CXXFLAGS"] if flag != "-Werror"])
cpp0x_env.Append(CXXFLAGS = ["-std=c++0x"])
if cpp0x :