From 9c8141de814be00554371ce8ba7686bca8146dca Mon Sep 17 00:00:00 2001
From: Mathias Stearn <mathias@10gen.com>
Date: Tue, 2 Aug 2011 20:59:22 -0400
Subject: [PATCH] compile

---
 SConstruct | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/SConstruct b/SConstruct
index e607b5f4ca4..0f28ad0a039 100644
--- a/SConstruct
+++ b/SConstruct
@@ -367,10 +367,7 @@ serverOnlyFiles += Glob( "db/commands/*.cpp" )
 coreServerFiles += Glob( "db/stats/*.cpp" )
 serverOnlyFiles += [ "db/driverHelpers.cpp" ]
 
-snappyEnv = env.Clone()
-snappyEnv.Append(CPPFLAGS="-Wno-sign-compare") #snappy doesn't compile cleanly
-serverOnlyFiles += snappyEnv.Object("third_party/snappy/snappy.cc")
-serverOnlyFiles += snappyEnv.Object("third_party/snappy/snappy-sinksource.cc")
+snappyFiles = ["third_party/snappy/snappy.cc", "third_party/snappy/snappy-sinksource.cc"]
 
 scriptingFiles = [ "scripting/engine.cpp" , "scripting/utils.cpp" , "scripting/bench.cpp" ]
 
@@ -714,7 +711,7 @@ if nix:
         env.Append( CPPFLAGS=" -O0 -fstack-protector " );
         env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
     else:
-        env.Append( CPPFLAGS=" -O3" )
+        env.Append( CPPFLAGS=" -O3 " )
         #env.Append( CPPFLAGS=" -fprofile-generate" )
         #env.Append( LINKFLAGS=" -fprofile-generate" )
         # then:
@@ -1121,6 +1118,11 @@ def checkErrorCodes():
 
 checkErrorCodes()
 
+snappyEnv = env.Clone()
+snappyEnv.Append(CPPFLAGS="-Wno-sign-compare -Wno-unused-function") #snappy doesn't compile cleanly
+serverOnlyFiles += [snappyEnv.Object(f) for f in snappyFiles]
+
+
 # main db target
 mongodOnlyFiles = [ "db/db.cpp", "db/compact.cpp" ]
 if windows: