diff options
author | 2019-08-28 22:56:15 +1000 | |
---|---|---|
committer | 2019-08-28 14:25:27 +0000 | |
commit | 6d76d3f8f86fa42b58e6d24839c1f05adc7286e4 (patch) | |
tree | c0a80e531cf2d17da1e6364988ce296b484b69fb | |
parent | 7486703578fa389df6f55cf7f6af13097fb6264d (diff) |
asmjs: can not ignore errors on missing libraries
The current Emscripten release is not happy with the use of
"-s ERROR_ON_MISSING_LIBRARIES=0" as a link option, it gives an error
stating that all libraries must now be present, so remove that use.
This leaves a missing 'util' library. This did not appear to be
needed on the few builds I have tried, and this patch avoids adding
this library for asmjs.
-rw-r--r-- | scripts/genie.lua | 1 | ||||
-rw-r--r-- | scripts/src/osd/sdl.lua | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index b1d76df09bf..707fc4d1d79 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1183,7 +1183,6 @@ configuration { "asmjs" } } linkoptions { "-Wl,--start-group", - "-s ERROR_ON_MISSING_LIBRARIES=0" } archivesplit_size "20" diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 9485fcc553c..75f4416a7f8 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -328,7 +328,7 @@ if BASE_TARGETOS=="unix" then "socket", "nsl", } - else + elseif _OPTIONS["targetos"]~="asmjs" then links { "util", } |