mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

fox for 64-bit linux that can't compile the shell but doesn't care

Browse Source
This commit is contained in:
yellow 2009-02-01 19:49:02 -05:00
parent 5c50c59ab9
commit 7cf0e20824
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
SConstruct
View File

@ -268,7 +268,7 @@ if nix:
# --- check system ---
def doConfigure( myenv , java=True , pcre=True):
def doConfigure( myenv , java=True , pcre=True , shell=False ):
conf = Configure(myenv)
myenv["LINKFLAGS_CLEAN"] = myenv["LINKFLAGS"]
myenv["LIBS_CLEAN"] = myenv["LIBS"]
@ -308,15 +308,11 @@ def doConfigure( myenv , java=True , pcre=True):
for b in boostLibs:
l = "boost_" + b
if not myCheckLib( [ l + "-mt" , l ] ):
print "can't find a required boost library [" + l + "]";
Exit(1)
myCheckLib( [ l + "-mt" , l ] , not shell)
if java:
for j in javaLibs:
if not myCheckLib( j ):
print( "can't find java lib [" + j + "]" )
Exit(1)
myCheckLib( j , True )
if nix and pcre:
myCheckLib( "pcrecpp" , True )
@ -467,7 +463,7 @@ if linux64 or force64:
shellEnv.Append( CFLAGS="-m32" )
shellEnv.Append( CXXFLAGS="-m32" )
shellEnv.Append( LINKFLAGS="-m32" )
shellEnv.Append( LIBPATH=[ "/usr/lib32" ] )
shellEnv.Append( LIBPATH=[ "/usr/lib32" , "/usr/lib" ] )
else:
shellEnv["CFLAGS"].remove("-m64")
shellEnv["CXXFLAGS"].remove("-m64")
@ -491,7 +487,7 @@ if linux64 or force64:
shellEnv.VariantDir( "32bit" , "." )
shellEnv = doConfigure( shellEnv , pcre=False , java=False )
shellEnv = doConfigure( shellEnv , pcre=False , java=False , shell=True )
shellEnv.Program( "mongo" , shell32BitFiles )
else: