Skip to content

Commit

Permalink
Always call EMAR with PYTHON as arg0 (emscripten-core#8342)
Browse files Browse the repository at this point in the history
In this case we use the create_lib wrapper to ensure this.

Fixes emscripten-core#8341
  • Loading branch information
sbc100 authored and VirtualTim committed May 21, 2019
1 parent e5584ad commit c184ae3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 0 additions & 2 deletions tools/ports/regal.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,7 @@ def create():

ports.run_commands(commands)
final = os.path.join(ports.get_build_dir(), 'regal', libname)
shared.try_delete(final)
ports.create_lib(final, o_s)
assert os.path.exists(final)
return final

return [shared.Cache.get(libname, create, what='port')]
Expand Down
4 changes: 1 addition & 3 deletions tools/ports/zlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ def create():
ports.run_commands(commands)

final = os.path.join(ports.get_build_dir(), 'zlib', 'libz.a')
shared.try_delete(final)
ports.run_commands([[shared.EMAR, 'rc', final] + o_s])
assert os.path.exists(final)
ports.create_lib(final, o_s)
return final

return [shared.Cache.get('libz.a', create, what='port')]
Expand Down

0 comments on commit c184ae3

Please sign in to comment.