diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-15 10:20:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-15 10:20:47 +0100 |
| commit | fea3890e1e994257a27cbf7480d8d4cdb037cfa6 (patch) | |
| tree | 7e0d675ed9388f5e2db151c3d3eb9e6353397cb9 | |
| parent | d1f8fd6384ae8d2caae368d79d1db23654868b98 (diff) | |
| parent | e9e2a4b0443885490357ad20ba8bf8e5f54029c8 (diff) | |
Merge pull request #33635 from akien-mga/emscripten-fix-1.39.1-support
HTML5: Fix support for Emscripten 1.39.1+
| -rw-r--r-- | platform/javascript/detect.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index a0d6ac9214..172072db3c 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -82,10 +82,7 @@ def configure(env): env['CXX'] = 'em++' env['LINK'] = 'emcc' - # Emscripten's ar has issues with duplicate file names, so use cc. - env['AR'] = 'emcc' - env['ARFLAGS'] = '-o' - # emranlib is a noop, so it's safe to use with AR=emcc. + env['AR'] = 'emar' env['RANLIB'] = 'emranlib' # Use TempFileMunge since some AR invocations are too long for cmd.exe. |