summaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
authorEliot Horowitz <eliot@10gen.com>2011-08-21 01:47:27 -0400
committerEliot Horowitz <eliot@10gen.com>2011-08-21 01:47:27 -0400
commitf97d900e5a1096471679ec5c640b1176d2b78594 (patch)
tree837ae2ee49eb137571bf30511b3f126cd9657371 /third_party
parentd40cad9feb14c0a2be44ddbe693a178181c4dbb1 (diff)
downloadmongo-f97d900e5a1096471679ec5c640b1176d2b78594.tar.gz
fix sm build for darwin SERVER-3659
Diffstat (limited to 'third_party')
-rwxr-xr-xthird_party/js-1.7/jscpucfgbin24601 -> 13752 bytes
-rw-r--r--third_party/sm.py2
2 files changed, 1 insertions, 1 deletions
diff --git a/third_party/js-1.7/jscpucfg b/third_party/js-1.7/jscpucfg
index bc6b088a734..72f153fc545 100755
--- a/third_party/js-1.7/jscpucfg
+++ b/third_party/js-1.7/jscpucfg
Binary files differ
diff --git a/third_party/sm.py b/third_party/sm.py
index 75366befc3a..d7d776270eb 100644
--- a/third_party/sm.py
+++ b/third_party/sm.py
@@ -57,7 +57,7 @@ def configure( env , fileLists , options ):
myenv.Append( CPPDEFINES=[ "JSFILE" , "EXPORT_JS_API" , "JS_C_STRINGS_ARE_UTF8" ] )
myenv["CPPFLAGS"] = myenv["CPPFLAGS"].replace( "-Werror" , "" )
- if os.sys.platform.startswith( "linux" ):
+ if os.sys.platform.startswith( "linux" ) or os.sys.platform == "darwin":
myenv["CPPDEFINES"] += [ "HAVE_VA_COPY" , "VA_COPY=va_copy" ]
fileLists["scriptingFiles"] += [ myenv.Object(root + "/" + f) for f in basicFiles ]