diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-11-21 13:51:08 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-11-21 13:51:08 -0800 |
| commit | cc5dfeec24ee6497a0120fca5d2f4c422c421616 (patch) | |
| tree | 87796708bbcec5137e32558d2d1d8bca8226ea37 /emscripten.py | |
| parent | 1f5805397c322ca55cfa9c094ecb440d904ed2a2 (diff) | |
fix pnacl tool names to pnacl master
Diffstat (limited to 'emscripten.py')
| -rwxr-xr-x | emscripten.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/emscripten.py b/emscripten.py index 5d281051..9d295499 100755 --- a/emscripten.py +++ b/emscripten.py @@ -742,27 +742,27 @@ def emscript_fast(infile, settings, outfile, libraries=[], compiler_engine=None, if DEBUG: logging.debug(' ..1..') temp1 = temp_files.get('.1.bc').name - shared.jsrun.timeout_run(subprocess.Popen([os.path.join(shared.PNACL_ROOT, 'pnacl-opt'), infile, '-pnacl-abi-simplify-preopt', '-o', temp1])) + shared.jsrun.timeout_run(subprocess.Popen([os.path.join(shared.PNACL_ROOT, 'opt'), infile, '-pnacl-abi-simplify-preopt', '-o', temp1])) assert os.path.exists(temp1) if DEBUG: shutil.copyfile(temp1, os.path.join(shared.CANONICAL_TEMP_DIR, 'temp1.bc')) - shared.jsrun.timeout_run(subprocess.Popen([os.path.join(shared.PNACL_ROOT, 'pnacl-dis'), 'temp1.bc', '-o', 'temp1.ll'])) + shared.jsrun.timeout_run(subprocess.Popen([os.path.join(shared.PNACL_ROOT, 'llvm-dis'), 'temp1.bc', '-o', 'temp1.ll'])) if DEBUG: logging.debug(' ..2..') temp2 = temp_files.get('.2.bc').name - shared.jsrun.timeout_run(subprocess.Popen([os.path.join(shared.PNACL_ROOT, 'pnacl-opt'), temp1, '-O3', '-o', temp2])) + shared.jsrun.timeout_run(subprocess.Popen([os.path.join(shared.PNACL_ROOT, 'opt'), temp1, '-O3', '-o', temp2])) assert os.path.exists(temp2) if DEBUG: shutil.copyfile(temp2, os.path.join(shared.CANONICAL_TEMP_DIR, 'temp2.bc')) - shared.jsrun.timeout_run(subprocess.Popen([os.path.join(shared.PNACL_ROOT, 'pnacl-dis'), 'temp2.bc', '-o', 'temp2.ll'])) + shared.jsrun.timeout_run(subprocess.Popen([os.path.join(shared.PNACL_ROOT, 'llvm-dis'), 'temp2.bc', '-o', 'temp2.ll'])) if DEBUG: logging.debug(' ..3..') temp3 = temp_files.get('.3.bc').name - shared.jsrun.timeout_run(subprocess.Popen([os.path.join(shared.PNACL_ROOT, 'pnacl-opt'), temp2, '-pnacl-abi-simplify-postopt', '-o', temp3])) + shared.jsrun.timeout_run(subprocess.Popen([os.path.join(shared.PNACL_ROOT, 'opt'), temp2, '-pnacl-abi-simplify-postopt', '-o', temp3])) assert os.path.exists(temp3) if DEBUG: shutil.copyfile(temp3, os.path.join(shared.CANONICAL_TEMP_DIR, 'temp3.bc')) - shared.jsrun.timeout_run(subprocess.Popen([os.path.join(shared.PNACL_ROOT, 'pnacl-dis'), 'temp3.bc', '-o', 'temp3.ll'])) + shared.jsrun.timeout_run(subprocess.Popen([os.path.join(shared.PNACL_ROOT, 'llvm-dis'), 'temp3.bc', '-o', 'temp3.ll'])) if DEBUG: logging.debug(' ..4..') temp4 = temp_files.get('.4.js').name |