diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2015-03-02 13:41:22 -0500 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2015-03-03 14:03:32 -0500 |
| commit | 95940768bcff61b59ed83dcc94c5afc001cef70f (patch) | |
| tree | cee8de123935dedc9afa0711c8d764b5f9a926f0 /SConstruct | |
| parent | 65f0efbe658d288267bd9c1f9f2a77a22794aacd (diff) | |
| download | mongo-95940768bcff61b59ed83dcc94c5afc001cef70f.tar.gz | |
SERVER-8994: Remove Boost 1.49
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index a864868b745..0af6adb7170 100644 --- a/SConstruct +++ b/SConstruct @@ -295,9 +295,9 @@ add_option( "use-system-pcre", "use system version of pcre library", 0, True ) add_option( "use-system-wiredtiger", "use system version of wiredtiger library", 0, True) # library choices -boost_choices = ['1.49', '1.56'] +boost_choices = ['1.56'] add_option( "internal-boost", "Specify internal boost version to use", 1, True, - type='choice', default=boost_choices[1], choices=boost_choices) + type='choice', default=boost_choices[0], choices=boost_choices) add_option( "system-boost-lib-search-suffixes", "Comma delimited sequence of boost library suffixes to search", @@ -1131,8 +1131,9 @@ if get_option("system-boost-lib-search-suffixes") is not None: # of boost is in play. boostSuffix = ""; if not use_system_version_of_library("boost"): - if get_option( "internal-boost") != "1.49": - boostSuffix = "-1.56.0" + # Boost release numbers are x.y.z, where z is usually 0 which we do not include in + # the internal-boost option + boostSuffix = "-%s.0" % get_option( "internal-boost") env.Prepend(CPPDEFINES=['BOOST_ALL_NO_LIB']) env.Append( CPPPATH=['$EXTRACPPPATH'], |