|
 |
6b52aa |
diff -urp mongodb-src-r2.4.5.orig/SConstruct mongodb-src-r2.4.5/SConstruct
|
|
|
6b52aa |
--- mongodb-src-r2.4.5.orig/SConstruct 2013-07-08 16:30:00.013000000 -0500
|
|
|
6b52aa |
+++ mongodb-src-r2.4.5/SConstruct 2013-07-08 16:30:32.853000000 -0500
|
|
|
6b52aa |
@@ -154,6 +154,9 @@ add_option( "cxx", "compiler to use" , 1
|
|
|
6b52aa |
add_option( "cc", "compiler to use for c" , 1 , True )
|
|
|
6b52aa |
add_option( "ld", "linker to use" , 1 , True )
|
|
|
6b52aa |
|
|
|
6b52aa |
+add_option( "extraccflags", "add'l ccflag options (--extraccflags -fPIC)" , 1 , True )
|
|
|
6b52aa |
+add_option( "extralinkflags", "add'l linkflag options (--extralinkflags -fPIC)" , 1 , True )
|
|
|
6b52aa |
+
|
|
|
6b52aa |
add_option( "cpppath", "Include path if you have headers in a nonstandard directory" , 1 , True )
|
|
|
6b52aa |
add_option( "libpath", "Library path if you have libraries in a nonstandard directory" , 1 , True )
|
|
|
6b52aa |
|
|
|
6b52aa |
@@ -450,6 +453,14 @@ if has_option( "extralib" ):
|
|
|
6b52aa |
for x in GetOption( "extralib" ).split( "," ):
|
|
|
6b52aa |
env.Append( LIBS=[ x ] )
|
|
|
6b52aa |
|
|
|
6b52aa |
+if has_option( "extraccflags" ):
|
|
|
6b52aa |
+ for x in GetOption( "extraccflags" ).split( " " ):
|
|
|
6b52aa |
+ env.Append( CCFLAGS=[ x ] )
|
|
|
6b52aa |
+
|
|
|
6b52aa |
+if has_option( "extralinkflags" ):
|
|
|
6b52aa |
+ for x in GetOption( "extralinkflags" ).split( " " ):
|
|
|
6b52aa |
+ env.Append( LINKFLAGS=[ x ] )
|
|
|
6b52aa |
+
|
|
|
6b52aa |
class InstallSetup:
|
|
|
6b52aa |
binaries = False
|
|
|
6b52aa |
libraries = False
|
|
|
6b52aa |
@@ -765,6 +776,9 @@ if nix:
|
|
|
6b52aa |
print( "removing precompiled headers" )
|
|
|
6b52aa |
os.unlink( env.File("$BUILD_DIR/mongo/pch.h.$GCHSUFFIX").abspath ) # gcc uses the file if it exists
|
|
|
6b52aa |
|
|
|
6b52aa |
+ print( "DEBUG - CCFLAGS::" + env["CCFLAGS"] + "::" )
|
|
|
6b52aa |
+ print( "DEBUG - LINKFLAGS::" + env["LINKFLAGS"] + "::" )
|
|
|
6b52aa |
+
|
|
|
6b52aa |
if usesm:
|
|
|
6b52aa |
env.Append( CPPDEFINES=["JS_C_STRINGS_ARE_UTF8"] )
|
|
|
6b52aa |
|