diff options
| author | Morten Sørvig <morten.sorvig@qt.io> | 2021-05-19 11:41:51 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-06-23 06:57:21 +0000 |
| commit | 53eb44906c73997335e702d3eef40dec8f6b9cf7 (patch) | |
| tree | ceabb783f58189eb02efc226881b4e712c141e76 | |
| parent | 631a0cc45cbe70940746cd944d325d7d3bab8c15 (diff) | |
wasm: don’t set exit_runtime
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>
| -rw-r--r-- | cmake/QtWasmHelpers.cmake | 2 | ||||
| -rw-r--r-- | mkspecs/wasm-emscripten/qmake.conf | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/cmake/QtWasmHelpers.cmake b/cmake/QtWasmHelpers.cmake index ecea701042..240eaa0540 100644 --- a/cmake/QtWasmHelpers.cmake +++ b/cmake/QtWasmHelpers.cmake @@ -1,7 +1,7 @@ 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 EXTRA_EXPORTED_RUNTIME_METHODS=[UTF16ToString,stringToUTF16]" "SHELL:-s USE_WEBGL2=1" diff --git a/mkspecs/wasm-emscripten/qmake.conf b/mkspecs/wasm-emscripten/qmake.conf index cc3bc8064e..b519292879 100644 --- a/mkspecs/wasm-emscripten/qmake.conf +++ b/mkspecs/wasm-emscripten/qmake.conf @@ -37,7 +37,6 @@ EMCC_COMMON_LFLAGS += \ -s FULL_ES2=1 \ -s FULL_ES3=1 \ -s USE_WEBGL2=1 \ - -s EXIT_RUNTIME=1 \ -s ERROR_ON_UNDEFINED_SYMBOLS=1 \ -s EXTRA_EXPORTED_RUNTIME_METHODS=[\"UTF16ToString\",\"stringToUTF16\"] \ --bind \ |