diff options
| author | Eric Milkie <milkie@10gen.com> | 2014-01-17 16:55:29 -0500 |
|---|---|---|
| committer | Eric Milkie <milkie@10gen.com> | 2014-01-23 08:47:52 -0500 |
| commit | a6c4e86b0aba95fd34ef4b912909e9dd89d8425e (patch) | |
| tree | 5b33e8d2136a77e30ce1a94d3f02e3d6c7ae1b19 /src/third_party/SConscript | |
| parent | 6f7364be380fd69a9725339123e5476518ddbaee (diff) | |
| download | mongo-a6c4e86b0aba95fd34ef4b912909e9dd89d8425e.tar.gz | |
SERVER-12403 permit use-system-boost on Windows to work with autolib linking
Diffstat (limited to 'src/third_party/SConscript')
| -rw-r--r-- | src/third_party/SConscript | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/third_party/SConscript b/src/third_party/SConscript index 2a52742b4a2..2d368b87977 100644 --- a/src/third_party/SConscript +++ b/src/third_party/SConscript @@ -20,13 +20,18 @@ else: LIBDEPS=[ 'pcre-${PCRE_VERSION}/pcrecpp' ] ) if use_system_version_of_library("boost"): - env.Library("shim_boost", ['shim_boost.cpp'], - SYSLIBDEPS=[ - env['LIBDEPS_BOOST_PROGRAM_OPTIONS_SYSLIBDEP'], - env['LIBDEPS_BOOST_FILESYSTEM_SYSLIBDEP'], - env['LIBDEPS_BOOST_THREAD_SYSLIBDEP'], - env['LIBDEPS_BOOST_SYSTEM_SYSLIBDEP'] - ] ) + if windows: + # On Windows, we use the autolib feature of boost to link in the + # libraries we need, so we can't use SCons to detect them at configure time. + env.Library("shim_boost", ['shim_boost.cpp']) + else: + env.Library("shim_boost", ['shim_boost.cpp'], + SYSLIBDEPS=[ + env['LIBDEPS_BOOST_PROGRAM_OPTIONS_SYSLIBDEP'], + env['LIBDEPS_BOOST_FILESYSTEM_SYSLIBDEP'], + env['LIBDEPS_BOOST_THREAD_SYSLIBDEP'], + env['LIBDEPS_BOOST_SYSTEM_SYSLIBDEP'] + ] ) else: env.SConscript('boost/SConscript') env.Library( "shim_boost", ['shim_boost.cpp'], |