diff -Naur mongodb-src-r2.4.5/SConstruct mongodb-src-r2.4.5-lunar/SConstruct
--- mongodb-src-r2.4.5/SConstruct	2013-07-02 21:27:08.000000000 +0200
+++ mongodb-src-r2.4.5-lunar/SConstruct	2013-07-19 18:42:10.150913614 +0200
@@ -702,7 +702,6 @@
     # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
     env.Append( CCFLAGS=["-fPIC",
                          "-fno-strict-aliasing",
-                         "-ggdb",
                          "-pthread",
                          "-Wall",
                          "-Wsign-compare",
@@ -710,14 +709,15 @@
                          "-Winvalid-pch"] )
     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
     if linux:
-        env.Append( CCFLAGS=["-Werror", "-pipe"] )
+        # env.Append( CPPDEFINES=["XP_UNIX=1"] )
         if not has_option('clang'):
             env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's
 
     env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
-    env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
+    env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
+    env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
     env.Append( LINKFLAGS=["-fPIC", "-pthread",  "-rdynamic"] )
-    env.Append( LIBS=[] )
+    env.Append( LIBS=['pcre','pcrecpp'] )
 
     #make scons colorgcc friendly
     for key in ('HOME', 'TERM'):
@@ -734,7 +734,7 @@
         env.Append( CCFLAGS=["-O0", "-fstack-protector"] )
         env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
     else:
-        env.Append( CCFLAGS=["-O3"] )
+        env.Append( CXXFLAGS=["-O3"] )
 
     if debugLogging:
         env.Append( CPPDEFINES=["_DEBUG"] );