--- ./SConstruct.orig	2012-06-29 09:53:07.000000000 -0400
+++ ./SConstruct	2012-06-29 10:34:03.000000000 -0400
@@ -800,8 +800,9 @@
     options_topass["nix"] = nix
     
     if has_option( "use-system-" + shortName ) or has_option( "use-system-all" ):
-        print( "using system version of: " + shortName )
-        myModule.configureSystem( env , fileLists , options_topass )
+        if not (shortName == 'sm' and usev8):
+            print( "using system version of: " + shortName )
+            myModule.configureSystem( env , fileLists , options_topass )
     else:
         myModule.configure( env , fileLists , options_topass )
 
@@ -1461,7 +1462,7 @@
     fullInstallName = installDir + "/bin/" + name
 
     allBinaries += [ name ]
-    if (solaris or linux) and (not has_option("nostrip")):
+    if (solaris or linux or freebsd) and (not has_option("nostrip")):
         e.AddPostAction( inst, e.Action( 'strip ' + fullInstallName ) )
 
     if not has_option( "no-glibc-check" ) and linux and len( COMMAND_LINE_TARGETS ) == 1 and str( COMMAND_LINE_TARGETS[0] ) == "s3dist":