Skip to content

Commit

Permalink
SERVER-3331: On Windows, build the client driver, even if you cannot …
Browse files Browse the repository at this point in the history
…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.
  • Loading branch information
Andy Schwerin committed Apr 13, 2012
1 parent 06e99af commit c6bc790
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions distsrc/client/SConstruct
Expand Up @@ -44,16 +44,18 @@ env.Append(CPPDEFINES=[ "_SCONS", "MONGO_EXPOSE_MACROS" ])

nix = False
linux = False

win = False

if "darwin" == sys.platform:
addExtraLibs( "/opt/local/" )
nix = True
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:
Expand All @@ -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()
Expand Down

0 comments on commit c6bc790

Please sign in to comment.