aboutsummaryrefslogtreecommitdiff
path: root/settings.py
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2011-07-29 15:16:50 -0700
committerAlon Zakai <alonzakai@gmail.com>2011-07-29 15:16:50 -0700
commitdece1080e837ccddddac1187709cdd669329b1a1 (patch)
treea211bb4a5def584d26d19f52db3aa62846d21924 /settings.py
parent5494a7299bc3d2354dce7c244ae3d01c17ccac61 (diff)
js engine and emmaken fixes
Diffstat (limited to 'settings.py')
-rw-r--r--settings.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/settings.py b/settings.py
index e91d07d2..5079289f 100644
--- a/settings.py
+++ b/settings.py
@@ -13,13 +13,11 @@ COMPILER_OPTS = ['-m32'] # Need to build as 32bit arch, for now -
# various errors on 64bit compilation
# WARNING: '-g' here will generate llvm bitcode that lli will crash on!
-SPIDERMONKEY_ENGINE = [os.path.expanduser('~/Dev/tracemonkey/js/src/js'), '-m', '-j', '-p']
+SPIDERMONKEY_ENGINE = [os.path.expanduser('~/Dev/mozilla-central/js/src/js'), '-m', '-j', '-p']
V8_ENGINE = [os.path.expanduser('~/Dev/v8/d8')]
-# XXX Warning: Compiling the 'cubescript' test in SpiderMonkey can lead to an extreme amount of memory being
-# used, see Mozilla bug 593659. Possibly also some other tests as well.
-#COMPILER_ENGINE=SPIDERMONKEY_ENGINE
-COMPILER_ENGINE=V8_ENGINE
+COMPILER_ENGINE=SPIDERMONKEY_ENGINE
+#COMPILER_ENGINE=V8_ENGINE # XXX Warning: currently appears to be broken on v8 trunk, some arguments issue
JS_ENGINE=V8_ENGINE