godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HTML5: Fix support for Emscripten 1.39.1+ 

A change in upstream Emscripten 1.39.1+ made our buildsystem error
out where it was previously only issuing a warning:
```
[  5%] Linking Static Library ==> main/libmain.javascript.opt.bc
shared:WARNING: Assuming object file output in the absence of `-c`, based on output filename. Please add with `-c` or `-r` to avoid this warning
Ranlib Library         ==> main/libmain.javascript.opt.bc
/opt/emsdk/upstream/bin/llvm-ranlib: error: unable to load 'main/libmain.javascript.opt.bc': file too small to be an archive
```

As advised on emscripten-core/emscripten#9806, we should be using
`emar` here to create the static library and not `emcc`.
This was apparently done to workaround Emscripten issues in the past,
but evidently this is no longer necessary.

The rest of the `env` redefinitions should probably be re-assessed
against the current state of Emscripten.

Fixes #33374.

(cherry picked from commit e9e2a4b044)
This commit is contained in:
Rémi Verschelde 2019-11-15 09:39:18 +01:00
parent 3b82f52f7d
commit bf204bdc7c
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

@ -77,10 +77,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.