diff options
author | Alon Zakai <alonzakai@gmail.com> | 2013-11-21 18:04:14 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2013-11-21 18:04:14 -0800 |
commit | 13687415a5d557750c9f65bcfcd8f8d974bc8101 (patch) | |
tree | 2249866ff1d21e73cdf15dc656e3a9dc90600308 /emscripten.py | |
parent | 14db7d55d2ee01944d47a12bccb83b918f152d22 (diff) |
assume for now that js optimizer runs after fastcomp
Diffstat (limited to 'emscripten.py')
-rwxr-xr-x | emscripten.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/emscripten.py b/emscripten.py index b111610d..dabf4f94 100755 --- a/emscripten.py +++ b/emscripten.py @@ -725,7 +725,7 @@ def emscript_fast(infile, settings, outfile, libraries=[], compiler_engine=None, outfile: The file where the output is written. """ - compiler = path_from_root('src', 'compiler.js') + assert(settings['RUNNING_JS_OPTS']) # Overview: # * Run LLVM backend to emit JS. JS includes function bodies, memory initializer, @@ -813,7 +813,7 @@ def emscript_fast(infile, settings, outfile, libraries=[], compiler_engine=None, # Call js compiler if DEBUG: t = time.time() - out = jsrun.run_js(compiler, compiler_engine, [settings_file, ';', 'glue'] + libraries, stdout=subprocess.PIPE, stderr=STDERR_FILE, + out = jsrun.run_js(path_from_root('src', 'compiler.js'), compiler_engine, [settings_file, ';', 'glue'] + libraries, stdout=subprocess.PIPE, stderr=STDERR_FILE, cwd=path_from_root('src')) assert '//FORWARDED_DATA:' in out, 'Did not receive forwarded data in pre output - process failed?' glue, forwarded_data = out.split('//FORWARDED_DATA:') |