1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: don’t set exit_runtime

Browse Source 
Go with Emscripten’s default of not shutting down on
main() exit; this allows for writing main() in such
a way that avoids the exec() workaround.

Existing main() implementations (which do use the exec()
workaround) do not shut down Qt cleanly anyway, so we
gain little by shutting down the Emscripten runtime.

Applications can set this flag if they do want to shut
down on main() exit:
    LFAGS += -s EXIT_RUNTIME=1

Change-Id: I52e1cc2bc907d1d2146822713e39b7610db3f95b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
This commit is contained in:
Morten Sørvig 2021-05-19 11:41:51 +02:00 committed by Tor Arne Vestbø
parent 631a0cc45c
commit 53eb44906c
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtWasmHelpers.cmake
View File

@ -1,7 +1,7 @@
function (qt_internal_setup_wasm_target_properties wasmTarget) function (qt_internal_setup_wasm_target_properties wasmTarget)
target_link_options("${wasmTarget}" INTERFACE "SHELL:-s EXIT_RUNTIME=1" target_link_options("${wasmTarget}" INTERFACE
"SHELL:-s ERROR_ON_UNDEFINED_SYMBOLS=1" "SHELL:-s ERROR_ON_UNDEFINED_SYMBOLS=1"
"SHELL:-s EXTRA_EXPORTED_RUNTIME_METHODS=[UTF16ToString,stringToUTF16]" "SHELL:-s EXTRA_EXPORTED_RUNTIME_METHODS=[UTF16ToString,stringToUTF16]"
"SHELL:-s USE_WEBGL2=1" "SHELL:-s USE_WEBGL2=1"

1
mkspecs/wasm-emscripten/qmake.conf
View File

@ -37,7 +37,6 @@ EMCC_COMMON_LFLAGS += \
-s FULL_ES2=1 \ -s FULL_ES2=1 \
-s FULL_ES3=1 \ -s FULL_ES3=1 \
-s USE_WEBGL2=1 \ -s USE_WEBGL2=1 \
-s EXIT_RUNTIME=1 \
-s ERROR_ON_UNDEFINED_SYMBOLS=1 \ -s ERROR_ON_UNDEFINED_SYMBOLS=1 \
-s EXTRA_EXPORTED_RUNTIME_METHODS=[\"UTF16ToString\",\"stringToUTF16\"] \ -s EXTRA_EXPORTED_RUNTIME_METHODS=[\"UTF16ToString\",\"stringToUTF16\"] \
--bind \ --bind \