asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #33635 from akien-mga/emscripten-fix-1.39.1-support

Browse source 
HTML5: Fix support for Emscripten 1.39.1+
This commit is contained in:
Rémi Verschelde 2019-11-15 10:20:47 +01:00 committed by GitHub
commit fea3890e1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
platform/javascript/detect.py
View file

@ -82,10 +82,7 @@ def configure(env):
env['CXX'] = 'em++' env['CXX'] = 'em++'
env['LINK'] = 'emcc' env['LINK'] = 'emcc'
# Emscripten's ar has issues with duplicate file names, so use cc. env['AR'] = 'emar'
env['AR'] = 'emcc'
env['ARFLAGS'] = '-o'
# emranlib is a noop, so it's safe to use with AR=emcc.
env['RANLIB'] = 'emranlib' env['RANLIB'] = 'emranlib'
# Use TempFileMunge since some AR invocations are too long for cmd.exe. # Use TempFileMunge since some AR invocations are too long for cmd.exe.