diff options
| author | Andrew Morrow <acm@mongodb.com> | 2015-06-19 17:18:25 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2015-06-30 12:16:55 -0400 |
| commit | 6abd1d0e9cdc691e6daf30ce3316ffb820b9bb70 (patch) | |
| tree | 00b5311c157c3623f92e70234bf4e8cc687c4917 /SConstruct | |
| parent | 112ab99be08e3217aa87586a697c576dba0de5fd (diff) | |
| download | mongo-6abd1d0e9cdc691e6daf30ce3316ffb820b9bb70.tar.gz | |
SERVER-19099 Consistently use concurrency and time names via stdx
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 3ebde7845b3..bc0904be4b1 100644 --- a/SConstruct +++ b/SConstruct @@ -2039,14 +2039,21 @@ def doConfigure(myenv): myenv.ConfError("Cannot find wiredtiger headers") conf.FindSysLibDep("wiredtiger", ["wiredtiger"]) + conf.env.Append( + CPPDEFINES=[ + ("BOOST_THREAD_VERSION", "4"), + # Boost thread v4's variadic thread support doesn't + # permit more than four parameters. + "BOOST_THREAD_DONT_PROVIDE_VARIADIC_THREAD", + ] + ) + if use_system_version_of_library("boost"): if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ): myenv.ConfError("can't find boost headers") if not conf.CheckBoostMinVersion(): myenv.ConfError("system's version of boost is too old. version 1.49 or better required") - conf.env.Append(CPPDEFINES=[("BOOST_THREAD_VERSION", "2")]) - # Note that on Windows with using-system-boost builds, the following # FindSysLibDep calls do nothing useful (but nothing problematic either) # |