diff options
| author | max99x <max99x@gmail.com> | 2011-07-30 04:02:27 +0300 |
|---|---|---|
| committer | max99x <max99x@gmail.com> | 2011-07-30 04:02:27 +0300 |
| commit | a6e44cf635adb9a46f86f655075f3817c741f76e (patch) | |
| tree | f108ae5e8f664740244bf4839fcbf9855f9a737a /settings.py | |
| parent | efacab6cd2ee666207ece72478c261dbaf476322 (diff) | |
| parent | da3cce725967ce04bdf62d73faf2d947f8063d0a (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'settings.py')
| -rw-r--r-- | settings.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/settings.py b/settings.py index 31f115c2..9773aa1e 100644 --- a/settings.py +++ b/settings.py @@ -13,13 +13,11 @@ COMPILER_OPTS = ['-m32', '-g'] # 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 |