aboutsummaryrefslogtreecommitdiff
path: root/tools/shared.py
diff options
context:
space:
mode:
Diffstat (limited to 'tools/shared.py')
-rw-r--r--tools/shared.py9
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')