Created
September 22, 2012 06:41
-
-
Save kimuraw/3765382 to your computer and use it in GitHub Desktop.
A patch for mongo-2.2.0 to fix build error with --use-system-sm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/mongo/SConscript b/src/mongo/SConscript | |
index 06022a1..e1dd08f 100644 | |
--- a/src/mongo/SConscript | |
+++ b/src/mongo/SConscript | |
@@ -175,7 +175,7 @@ env.CppUnitTest('bson_template_evaluator_test', ['scripting/bson_template_evalua | |
if usesm: | |
env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_spidermonkey.cpp'], | |
- LIBDEPS=['$BUILD_DIR/third_party/js-1.7/js', 'bson_template_evaluator']) | |
+ LIBDEPS=['$BUILD_DIR/third_party/shim_spidermonkey', 'bson_template_evaluator']) | |
elif usev8: | |
env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_v8.cpp', | |
'scripting/v8_db.cpp', | |
diff --git a/src/third_party/SConscript b/src/third_party/SConscript | |
index 5a53571..e4d7a63 100644 | |
--- a/src/third_party/SConscript | |
+++ b/src/third_party/SConscript | |
@@ -33,6 +33,10 @@ else: | |
env.StaticLibrary('shim_snappy', ['shim_snappy.cpp'], LIBDEPS=['snappy/snappy']) | |
if use_system_version_of_library("sm"): | |
+ if windows: | |
+ env.Append(CPPDEFINES=['XP_WIN']) | |
+ else: | |
+ env.Append(CPPDEFINES=['XP_UNIX']) | |
env.StaticLibrary("shim_spidermonkey", ['shim_spidermonkey.cpp'], SYSLIBDEPS=['js']) | |
else: | |
if windows: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment