diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2017-07-27 15:06:40 -0400 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2017-07-27 15:07:14 -0400 |
| commit | bca21d14a4f25d7884d1f56d2e6ff02e334c9578 (patch) | |
| tree | 69061b8c200a37bc01f29f9ea6d1e7f9861fa332 | |
| parent | 026a71c19c3f4604e8bc134e74dede28f175c063 (diff) | |
| download | mongo-bca21d14a4f25d7884d1f56d2e6ff02e334c9578.tar.gz | |
SERVER-30199 Fix --use-system-boost
(cherry picked from commit ba6674f43b940360664b7dfc1c1933384b713c38)
| -rw-r--r-- | SConstruct | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/SConstruct b/SConstruct index 5365fcb7969..13149ab82be 100644 --- a/SConstruct +++ b/SConstruct @@ -2603,26 +2603,6 @@ def doConfigure(myenv): if conf.CheckCXX11Align(): conf.env.SetConfigHeaderDefine('MONGO_CONFIG_HAVE_STD_ALIGN') - myenv = conf.Finish() - - def CheckBoostMinVersion(context): - compile_test_body = textwrap.dedent(""" - #include <boost/version.hpp> - - #if BOOST_VERSION < 104900 - #error - #endif - """) - - context.Message("Checking if system boost version is 1.49 or newer...") - result = context.TryCompile(compile_test_body, ".cpp") - context.Result(result) - return result - - conf = Configure(myenv, custom_tests = { - 'CheckBoostMinVersion': CheckBoostMinVersion, - }) - # pthread_setname_np was added in GLIBC 2.12, and Solaris 11.3 if posix_system: myenv = conf.Finish() @@ -2650,6 +2630,26 @@ def doConfigure(myenv): if conf.CheckPThreadSetNameNP(): conf.env.SetConfigHeaderDefine("MONGO_CONFIG_HAVE_PTHREAD_SETNAME_NP") + myenv = conf.Finish() + + def CheckBoostMinVersion(context): + compile_test_body = textwrap.dedent(""" + #include <boost/version.hpp> + + #if BOOST_VERSION < 104900 + #error + #endif + """) + + context.Message("Checking if system boost version is 1.49 or newer...") + result = context.TryCompile(compile_test_body, ".cpp") + context.Result(result) + return result + + conf = Configure(myenv, custom_tests = { + 'CheckBoostMinVersion': CheckBoostMinVersion, + }) + libdeps.setup_conftests(conf) def addOpenSslLibraryToDistArchive(file_name): |