summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorEliot Horowitz <eliot@10gen.com>2011-01-26 14:19:40 -0500
committerEliot Horowitz <eliot@10gen.com>2011-01-26 14:19:40 -0500
commit7ccac7109dccc0384b761f6b02b9788342c5eabb (patch)
treec06c95233be2bd04374624405548f69a9589ae9c /SConstruct
parent1978898d7a013657e5400133defdc996fb4c2c15 (diff)
downloadmongo-7ccac7109dccc0384b761f6b02b9788342c5eabb.tar.gz
fix osx 64-bit
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct12
1 files changed, 9 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct
index a566cf731c4..500008cf80d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -324,15 +324,19 @@ else:
commonFiles += [ "util/mmap_posix.cpp" ]
coreDbFiles = [ "db/commands.cpp" ]
-coreServerFiles = [ "util/processinfo.cpp" , "util/message_server_port.cpp" ,
+coreServerFiles = [ "util/message_server_port.cpp" ,
"client/parallel.cpp" ,
"util/miniwebserver.cpp" , "db/dbwebserver.cpp" ,
"db/matcher.cpp" , "db/dbcommands_generic.cpp" ]
+processInfoFiles = [ "util/processinfo.cpp" ]
+
if os.path.exists( "util/processinfo_" + os.sys.platform + ".cpp" ):
- coreServerFiles += [ "util/processinfo_" + os.sys.platform + ".cpp" ]
+ processInfoFiles += [ "util/processinfo_" + os.sys.platform + ".cpp" ]
else:
- coreServerFiles += [ "util/processinfo_none.cpp" ]
+ processInfoFiles += [ "util/processinfo_none.cpp" ]
+
+coreServerFiles += processInfoFiles
@@ -1180,6 +1184,8 @@ elif not onlyServer:
shell32BitFiles.append( "32bit/" + str( f ) )
for f in scriptingFiles:
shell32BitFiles.append( "32bit/" + str( f ) )
+ for f in processInfoFiles:
+ shell32BitFiles.append( "32bit/" + str( f ) )
shellEnv.VariantDir( "32bit" , "." , duplicate=1 )
else:
shellEnv.Prepend( LIBPATH=[ "." ] )