diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2017-07-27 15:03:20 -0400 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2017-07-27 15:03:20 -0400 |
| commit | ba6674f43b940360664b7dfc1c1933384b713c38 (patch) | |
| tree | e40c3083acc081e850995aaac07a8b9075209489 /SConstruct | |
| parent | 743eaeacf0866ffeda630da479363874cc5f6d36 (diff) | |
| download | mongo-ba6674f43b940360664b7dfc1c1933384b713c38.tar.gz | |
SERVER-30199 Fix --use-system-boost
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/SConstruct b/SConstruct index d16a8fbd61f..7353ea36c84 100644 --- a/SConstruct +++ b/SConstruct @@ -2592,26 +2592,6 @@ def doConfigure(myenv): if conf.CheckCXX14MakeUnique(): conf.env.SetConfigHeaderDefine('MONGO_CONFIG_HAVE_STD_MAKE_UNIQUE') - 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() @@ -2641,6 +2621,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): |