summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-04-08 08:40:49 (GMT)
committerTobias Markmann <tm@ayena.de>2016-04-12 14:12:45 (GMT)
commitb9ad76af13fc1d253845e027f91f22039bf14f9c (patch)
treec70d592a6bbbaae96e818e1de92e82e53390f393 /3rdParty/Boost/SConscript
parent4e6713df2d55dc1b2970d9c3b619d2a415e1264f (diff)
downloadswift-b9ad76af13fc1d253845e027f91f22039bf14f9c.zip
swift-b9ad76af13fc1d253845e027f91f22039bf14f9c.tar.bz2
Use C++11 threading library instead of Boost.Thread
This cuts down our dependency on Boost further. Another benefit is that mutex classes of C++11 standard library are recognized by TSAN. Test-Information: Unit and integration tests pass on OS X 10.11.4. Change-Id: Id4dcdb42e3d5155e107ce1d7618acbf26f913b6f
Diffstat (limited to '3rdParty/Boost/SConscript')
-rw-r--r--3rdParty/Boost/SConscript13
1 files changed, 0 insertions, 13 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript
index 6172777..6d04c0d 100644
--- a/3rdParty/Boost/SConscript
+++ b/3rdParty/Boost/SConscript
@@ -69,7 +69,6 @@ elif env.get("BOOST_BUNDLED", False) :
"src/libs/date_time/src/gregorian/gregorian_types.cpp",
"src/libs/date_time/src/posix_time/posix_time_types.cpp",
"src/libs/system/src/error_code.cpp",
- "src/libs/thread/src/tss_null.cpp",
"src/libs/filesystem/src/codecvt_error_category.cpp",
"src/libs/filesystem/src/operations.cpp",
"src/libs/filesystem/src/path.cpp",
@@ -149,18 +148,6 @@ elif env.get("BOOST_BUNDLED", False) :
"src/libs/program_options/src/parsers.cpp",
]
- if env["PLATFORM"] != "win32" :
- sources += [
- "src/libs/thread/src/pthread/once.cpp",
- "src/libs/thread/src/pthread/once_atomic.cpp",
- "src/libs/thread/src/pthread/thread.cpp"]
- else :
- sources += [
- "win32_stubs.cpp",
- "src/libs/thread/src/win32/thread.cpp",
- "src/libs/thread/src/win32/tss_dll.cpp",
- "src/libs/thread/src/win32/tss_pe.cpp"]
-
myenv.MergeFlags(myenv["BOOST_FLAGS"])
myenv.StaticLibrary("Swiften_Boost", sources)