diff options
| author | Andy Schwerin <schwerin@10gen.com> | 2012-04-12 22:18:27 -0400 |
|---|---|---|
| committer | Andy Schwerin <schwerin@10gen.com> | 2012-04-12 22:25:36 -0400 |
| commit | c6bc7907749ac7dc849607addd144647cd4dca89 (patch) | |
| tree | c9937a496934f2f732bf1dfc771008e8872a72e4 /distsrc | |
| parent | 06e99af88d14406e8b85d660625e1f75938f9a09 (diff) | |
| download | mongo-c6bc7907749ac7dc849607addd144647cd4dca89.tar.gz | |
SERVER-3331: On Windows, build the client driver, even if you cannot find the boost libraries.
Boost headers provide information that MSVC can use to find the correct version of boost libraries,
so it does not matter if SCons cannot find the libraries. Build anyways.
Diffstat (limited to 'distsrc')
| -rwxr-xr-x | distsrc/client/SConstruct | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/distsrc/client/SConstruct b/distsrc/client/SConstruct index f8d44817bf7..d7a0832946d 100755 --- a/distsrc/client/SConstruct +++ b/distsrc/client/SConstruct @@ -44,7 +44,7 @@ env.Append(CPPDEFINES=[ "_SCONS", "MONGO_EXPOSE_MACROS" ]) nix = False linux = False - +win = False if "darwin" == sys.platform: addExtraLibs( "/opt/local/" ) @@ -52,8 +52,10 @@ if "darwin" == sys.platform: elif sys.platform in ("linux2", "linux3"): nix = True linux = True +elif sys.platform == 'win32': + win = True -if sys.platform == 'win32': +if win: env['DIST_ARCHIVE_SUFFIX'] = '.zip' env.Append(CCFLAGS=['/EHsc', '/O2']) else: @@ -69,7 +71,8 @@ conf = Configure(env) for lib in boostLibs: if not conf.CheckLib(["boost_%s-mt" % lib, "boost_%s" % lib], language="C++"): - Exit(1) + if not win: + Exit(1) conf.Finish() clientEnv = env.Clone() |