summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Sørvig <[email protected]>2024-11-08 10:32:05 +0100
committerMorten Sørvig <[email protected]>2024-12-02 19:45:19 +0100
commit5e288c513bb6e701b5da0f02368ead6e354ca14a (patch)
treedda9697aa9c38b83accda5b1b94e3f6c4198ba0d
parent16fdbbf444aa828795e3b0cd6d420eaa16540b40 (diff)
wasm: Disable 4GB memory when JSPI is enabled
This triggers an Emscripten compatibility issue. Change-Id: I6cfe92d1c0d31e9aac27f0b91af2d2bd85d192ee Reviewed-by: Lorn Potter <[email protected]> Reviewed-by: Piotr Wierciński <[email protected]> Reviewed-by: Jøger Hansegård <[email protected]>
-rw-r--r--src/corelib/Qt6WasmMacros.cmake7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/Qt6WasmMacros.cmake b/src/corelib/Qt6WasmMacros.cmake
index 69de55cf57f..eae356679bd 100644
--- a/src/corelib/Qt6WasmMacros.cmake
+++ b/src/corelib/Qt6WasmMacros.cmake
@@ -121,7 +121,12 @@ function(_qt_internal_wasm_add_target_helpers target)
if(_tmp_maximumMemory)
set(QT_WASM_MAXIMUM_MEMORY "${_tmp_maximumMemory}")
elseif(NOT DEFINED QT_WASM_MAXIMUM_MEMORY)
- set(QT_WASM_MAXIMUM_MEMORY "4GB")
+ if(QT_FEATURE_wasm_jspi)
+ # Work around Emscripten >2GB and JSPI compatibility issue.
+ set(QT_WASM_MAXIMUM_MEMORY "2GB")
+ else()
+ set(QT_WASM_MAXIMUM_MEMORY "4GB")
+ endif()
endif()
target_link_options("${target}" PRIVATE "SHELL:-s MAXIMUM_MEMORY=${QT_WASM_MAXIMUM_MEMORY}")