Skip to content

Commit

Permalink
Revert "Add PYTHON to emmake and emconfigure commands when building s…
Browse files Browse the repository at this point in the history
…dl2-mixer (emscripten-core#8490)"

This reverts commit 60210f7.
  • Loading branch information
VirtualTim authored May 23, 2019
1 parent 2fa44da commit 3648766
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion emcc.py
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ def is_minus_s_for_emcc(args, i):
# 0 - use native compilation for configure checks
# 1 - use js when we think it will work
# 2 - always use js for configure checks
use_js = int(os.environ.get('EMCONFIGURE_JS', '2'))
use_js = int(os.environ.get('EMCONFIGURE_JS') or 2)

if debug_configure:
tempout = '/tmp/emscripten_temp/out'
Expand Down
4 changes: 2 additions & 2 deletions tools/ports/sdl2_mixer.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ def create():
try:
os.chdir(build_dir)
os.chmod(configure, os.stat(configure).st_mode | stat.S_IEXEC)
ports.run_commands([[shared.PYTHON, shared.EMCONFIGURE, configure, '--prefix=' + dist_dir] + formatflags + commonflags + ['CFLAGS=-s USE_VORBIS=1']])
ports.run_commands([[shared.PYTHON, shared.EMMAKE, 'make', 'install']])
ports.run_commands([[shared.EMCONFIGURE, configure, '--prefix=' + dist_dir] + formatflags + commonflags + ['CFLAGS=-s USE_VORBIS=1']])
ports.run_commands([[shared.EMMAKE, 'make', 'install']])
shutil.copyfile(out, final)
finally:
os.chdir(cwd)
Expand Down

0 comments on commit 3648766

Please sign in to comment.