diff options
| author | max99x <max99x@gmail.com> | 2011-09-13 02:14:32 +0300 |
|---|---|---|
| committer | max99x <max99x@gmail.com> | 2011-09-13 02:14:32 +0300 |
| commit | c5e5c90cd111c08b3d91d1bc89ba7d33a308cbc7 (patch) | |
| tree | 5c6033729c4a4c5593fcd87bd9ffa6debf21f285 /settings.py | |
| parent | 91e29b31f280b879b10debf2194c2b87d94857cf (diff) | |
| parent | 534cc7f05846daa88f2d3f2d149d9768262033e9 (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
src/intertyper.js
tests/runner.py
Diffstat (limited to 'settings.py')
| -rw-r--r-- | settings.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings.py b/settings.py index cf4fd28c..c6d63341 100644 --- a/settings.py +++ b/settings.py @@ -13,7 +13,7 @@ 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/mozilla-central/js/src/js'), '-m', '-j', '-p'] +SPIDERMONKEY_ENGINE = [os.path.expanduser('~/Dev/mozilla-central/js/src/js'), '-m', '-n'] V8_ENGINE = [os.path.expanduser('~/Dev/v8/d8')] #COMPILER_ENGINE=SPIDERMONKEY_ENGINE # XXX Warning: currently appears to be broken on trunk, some file reading issue |