diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-01-11 20:56:37 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-01-11 20:56:37 -0800 |
| commit | 5e107c8d5a10b74933f52cffaa27d0c01106dc60 (patch) | |
| tree | 8d0ee7ecd3f61bbe4841825c92e7df899bb1d89a /tools/shared.py | |
| parent | ea76a4c57a9382fd3af26b4d1a955a31d83978fd (diff) | |
better workaround for v8 bug 1895
Diffstat (limited to 'tools/shared.py')
| -rw-r--r-- | tools/shared.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tools/shared.py b/tools/shared.py index 0276726c..aee7de27 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -136,12 +136,6 @@ except: print 'ERROR: ~/.emscripten does not seem to have JS_ENGINES or JS_ENGINE set up' raise -try: - NODE_JS_SAFE # Workaround for node issue 2476. Use node trunk as NODE_JS_SAFE, it is slower, but it doesn't suffer from that bug. - # Define NODE_JS_SAFE in ~/.emscripten to use that workaround -except: - NODE_JS_SAFE = NODE_JS - # Additional compiler options try: @@ -621,7 +615,8 @@ class Building: if type(passes) == str: passes = [passes] - output, err = Popen([NODE_JS_SAFE, JS_OPTIMIZER, filename] + passes, stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate() + # XXX Disable crankshaft to work around v8 bug 1895 + output, err = Popen([NODE_JS, '--nocrankshaft', JS_OPTIMIZER, filename] + passes, stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate() assert len(output) > 0 and not output.startswith('Assertion failed'), 'Error in js optimizer: ' + err + '\n\n' + output filename += '.jo.js' f = open(filename, 'w') |