From 5b23f08b811ac238d20767e48e0ee1457c0fb8e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Thu, 23 Jun 2022 16:24:33 +0200 Subject: [PATCH] wasm: use simpler syntax for EXPORTED_RUNTIME_METHODS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Recents emsdk versions support specifying the method list without using brackets. Switch to this syntax since that avoids any quoting issues. Pick-to: 6.4 Change-Id: Ib7bf8ec3f0d2ef67e8222a23e7af9b368ee99a00 Reviewed-by: Morten Johan Sørvig --- cmake/QtWasmHelpers.cmake | 2 +- mkspecs/wasm-emscripten/qmake.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/QtWasmHelpers.cmake b/cmake/QtWasmHelpers.cmake index d17eb826b1..9ed280fef5 100644 --- a/cmake/QtWasmHelpers.cmake +++ b/cmake/QtWasmHelpers.cmake @@ -4,7 +4,7 @@ function (qt_internal_setup_wasm_target_properties wasmTarget) target_link_options("${wasmTarget}" INTERFACE "SHELL:-s ERROR_ON_UNDEFINED_SYMBOLS=1" - "SHELL:-s EXPORTED_RUNTIME_METHODS=[UTF16ToString,stringToUTF16]" + "SHELL:-s EXPORTED_RUNTIME_METHODS=UTF16ToString,stringToUTF16" "SHELL:-s MAX_WEBGL_VERSION=2" "SHELL:-s FETCH=1" "SHELL:-s WASM_BIGINT=1") diff --git a/mkspecs/wasm-emscripten/qmake.conf b/mkspecs/wasm-emscripten/qmake.conf index 2dcfe4e53e..9e5a223d1b 100644 --- a/mkspecs/wasm-emscripten/qmake.conf +++ b/mkspecs/wasm-emscripten/qmake.conf @@ -32,7 +32,7 @@ EMCC_COMMON_LFLAGS += \ -s WASM=1 \ -s MAX_WEBGL_VERSION=2 \ -s ERROR_ON_UNDEFINED_SYMBOLS=1 \ - -s EXPORTED_RUNTIME_METHODS=[UTF16ToString,stringToUTF16] \ + -s EXPORTED_RUNTIME_METHODS=UTF16ToString,stringToUTF16 \ --bind \ -s FETCH=1 \ -s MODULARIZE=1 \