Use pre-compiled libjs since smjs.gyp is out of date

creationix · May 10, 2012 · de259f7 · de259f7
1 parent b44bccd
commit de259f7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/luvmonkey.gyp b/luvmonkey.gyp
@@ -37,7 +37,7 @@
       'target_name': 'luvmonkey',
       'type': 'executable',
       'dependencies': [
-        'deps/smjs/smjs.gyp:smjs',
+        # 'deps/smjs/smjs.gyp:smjs',
         'deps/uv/uv.gyp:uv',
         'deps/http-parser/http_parser.gyp:http_parser',
         'js2c#host'
@@ -52,12 +52,15 @@
           'libraries': [
             '-ldl',
             '-lm',
+            '/home/tim/mozilla-central/js/src/libjs_static.a'
           ],
         }],
       ],
       'include_dirs': [
         'src',
         'deps/uv/src/ares',
+        '/home/tim/mozilla-central/js/src/',
+        '/home/tim/mozilla-central/js/src/dist/include/',
         '<(SHARED_INTERMEDIATE_DIR)' # for js_scripts.h
       ],
       'sources': [

diff --git a/src/main.c b/src/main.c
@@ -170,9 +170,8 @@ int main(int argc, const char *argv[])
   JS_EvaluateScript(cx, global, embedded_src_main_js, strlen(embedded_src_main_js), "main.js", 1, NULL);
 
   /* Cleanup. */
-  // TODO: find out why this triggers a smjs assert to fail.
-  // JS_DestroyContext(cx);
-  // JS_DestroyRuntime(rt);
-  // JS_ShutDown();
+  JS_DestroyContext(cx);
+  JS_DestroyRuntime(rt);
+  JS_ShutDown();
   return 0;
 }