diff options
| author | Andrew Morrow <acm@10gen.com> | 2013-09-10 11:56:57 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@10gen.com> | 2013-09-11 16:46:52 -0400 |
| commit | 73ce2fd28b095983be6a9ba95e2a8c4568444667 (patch) | |
| tree | b383afcc481b3ddc1e8be20c1a89cdb176b1004f /SConstruct | |
| parent | f0deda49e359f644e4045f9588b4d39e9398a095 (diff) | |
| download | mongo-73ce2fd28b095983be6a9ba95e2a8c4568444667.tar.gz | |
SERVER-9766 Don't fail the build on missing system libraries unless they are in demand
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/SConstruct b/SConstruct index 916d39dc006..d673cb2cc53 100644 --- a/SConstruct +++ b/SConstruct @@ -1196,24 +1196,17 @@ def doConfigure(myenv): AddToCCFLAGSIfSupported(myenv, "-fno-builtin-memcmp") conf = Configure(myenv) + libdeps.setup_conftests(conf) if use_system_version_of_library("pcre"): - if not conf.CheckLib("pcre"): - print( "Can't find pcre library" ) - Exit(1) - if not conf.CheckLib("pcrecpp"): - print( "Can't find prcecpp library" ) - Exit(1) + conf.FindSysLibDep("pcre", ["pcre"]) + conf.FindSysLibDep("pcrecpp", ["pcrecpp"]) if use_system_version_of_library("snappy"): - if not conf.CheckLib("snappy"): - print( "Can't find snappy library" ) - Exit(1) + conf.FindSysLibDep("snappy", ["snappy"]) if use_system_version_of_library("stemmer"): - if not conf.CheckLib("stemmer"): - print( "Can't find stemmer library" ) - Exit(1) + conf.FindSysLibDep("stemmer", ["stemmer"]) if use_system_version_of_library("boost"): if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ): @@ -1222,9 +1215,9 @@ def doConfigure(myenv): for b in boostLibs: l = "boost_" + b - if not conf.CheckLib([ l + boostCompiler + "-mt" + boostVersion, - l + boostCompiler + boostVersion ], language='C++' ): - Exit(1) + conf.FindSysLibDep(l, + [ l + boostCompiler + "-mt" + boostVersion, + l + boostCompiler + boostVersion ], language='C++' ) if conf.CheckHeader('unistd.h'): conf.env.Append(CPPDEFINES=['MONGO_HAVE_HEADER_UNISTD_H']) @@ -1249,13 +1242,11 @@ def doConfigure(myenv): v8_lib_choices = ["v8_g", "v8"] else: v8_lib_choices = ["v8"] - if not conf.CheckLib( v8_lib_choices ): - Exit(1) + conf.FindSysLibDep( "v8", v8_lib_choices ) conf.env['MONGO_BUILD_SASL_CLIENT'] = bool(has_option("use-sasl-client")) if conf.env['MONGO_BUILD_SASL_CLIENT'] and not conf.CheckLibWithHeader( - "sasl2", "sasl/sasl.h", "C", "sasl_version_info(0, 0, 0, 0, 0, 0);", autoadd=False): - + "sasl2", "sasl/sasl.h", "C", "sasl_version_info(0, 0, 0, 0, 0, 0);", autoadd=False ): Exit(1) # requires ports devel/libexecinfo to be installed @@ -1267,8 +1258,7 @@ def doConfigure(myenv): # point. if get_option('allocator') == 'tcmalloc': if use_system_version_of_library('tcmalloc'): - if not conf.CheckLib("tcmalloc"): - Exit(1) + conf.FindSysLibDep("tcmalloc", ["tcmalloc"]) elif has_option("heapcheck"): print ("--heapcheck does not work with the tcmalloc embedded in the mongodb source " "tree. Use --use-system-tcmalloc.") |