From 1daae4e935fedec555d52475dfaf8a72fca61d5b Mon Sep 17 00:00:00 2001
From: Andy Schwerin <schwerin@10gen.com>
Date: Wed, 7 Mar 2012 10:46:54 -0500
Subject: [PATCH] SERVER-5172: Respond to forgotten CR comments.

---
 SConstruct           | 16 ++++++++--------
 src/mongo/SConscript |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/SConstruct b/SConstruct
index 69b5ac2b9b0..8c35e26e8ca 100644
--- a/SConstruct
+++ b/SConstruct
@@ -487,14 +487,14 @@ if "darwin" == os.sys.platform:
 
     nix = True
 
-    #if force64:
-    #    env.Append( EXTRACPPPATH=["/usr/64/include"] )
-    #    env.Append( EXTRALIBPATH=["/usr/64/lib"] )
-    #    if installDir == DEFAULT_INSTALL_DIR and not distBuild:
-    #        installDir = "/usr/64/"
-    #else:
-    #    env.Append( EXTRACPPPATH=filterExists(["/sw/include" , "/opt/local/include"]) )
-    #    env.Append( EXTRALIBPATH=filterExists(["/sw/lib/", "/opt/local/lib"]) )
+    if force64:
+       env.Append( EXTRACPPPATH=["/usr/64/include"] )
+       env.Append( EXTRALIBPATH=["/usr/64/lib"] )
+       if installDir == DEFAULT_INSTALL_DIR and not distBuild:
+           installDir = "/usr/64/"
+    else:
+       env.Append( EXTRACPPPATH=filterExists(["/sw/include" , "/opt/local/include"]) )
+       env.Append( EXTRALIBPATH=filterExists(["/sw/lib/", "/opt/local/lib"]) )
 
 elif os.sys.platform.startswith("linux"):
     linux = True
diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 88a88b7cc1f..d62ce889394 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -91,7 +91,8 @@ commonFiles = [ "pch.cpp",
 commonFiles += env['MONGO_COMMON_FILES']
 
 env.StaticLibrary('mongocommon', commonFiles,
-                  LIBDEPS=['$BUILD_DIR/third_party/pcrecpp', '$BUILD_DIR/third_party/murmurhash3/murmurhash3',
+                  LIBDEPS=['$BUILD_DIR/third_party/pcrecpp',
+                           '$BUILD_DIR/third_party/murmurhash3/murmurhash3',
                            '$BUILD_DIR/third_party/mongo_boost'],)
 
 #mmap stuff