xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SERVER-5172: Respond to forgotten CR comments.

Browse Source
This commit is contained in:
Andy Schwerin
2012-03-07 10:46:54 -05:00
parent a8c3284a03
commit 1daae4e935
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SConstruct
View File

@@ -487,14 +487,14 @@ if "darwin" == os.sys.platform:
nix = True
#if force64:
# env.Append( EXTRACPPPATH=["/usr/64/include"] )
# env.Append( EXTRALIBPATH=["/usr/64/lib"] )
# if installDir == DEFAULT_INSTALL_DIR and not distBuild:
# installDir = "/usr/64/"
#else:
# env.Append( EXTRACPPPATH=filterExists(["/sw/include" , "/opt/local/include"]) )
# env.Append( EXTRALIBPATH=filterExists(["/sw/lib/", "/opt/local/lib"]) )
if force64:
env.Append( EXTRACPPPATH=["/usr/64/include"] )
env.Append( EXTRALIBPATH=["/usr/64/lib"] )
if installDir == DEFAULT_INSTALL_DIR and not distBuild:
installDir = "/usr/64/"
else:
env.Append( EXTRACPPPATH=filterExists(["/sw/include" , "/opt/local/include"]) )
env.Append( EXTRALIBPATH=filterExists(["/sw/lib/", "/opt/local/lib"]) )
elif os.sys.platform.startswith("linux"):
linux = True

3
src/mongo/SConscript
View File

@@ -91,7 +91,8 @@ commonFiles = [ "pch.cpp",
commonFiles += env['MONGO_COMMON_FILES']
env.StaticLibrary('mongocommon', commonFiles,
LIBDEPS=['$BUILD_DIR/third_party/pcrecpp', '$BUILD_DIR/third_party/murmurhash3/murmurhash3',
LIBDEPS=['$BUILD_DIR/third_party/pcrecpp',
'$BUILD_DIR/third_party/murmurhash3/murmurhash3',
'$BUILD_DIR/third_party/mongo_boost'],)
#mmap stuff