diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2022-01-12 22:21:07 +0100 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2022-01-17 09:01:14 +0000 |
| commit | bb8c73ab9e26376170d6b18fa0bc5e9c0594b7f5 (patch) | |
| tree | e700e58dd7aad141a4b7e1f2167be5c60d593f04 | |
| parent | cf390e48b1360bbf9ec9c9a5eabb3d31552b8e4d (diff) | |
wasm: modernize pthreads option
Use “-pthreads” instead of “-s USE_PTHREADS=1”. This
is both a compile and linker option.
Pick-to: 6.3
Change-Id: Iaf7cb4ec41577fe596c3e81fda05c03fe0074c08
Reviewed-by: David Skoland <david.skoland@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| -rw-r--r-- | cmake/QtWasmHelpers.cmake | 4 | ||||
| -rw-r--r-- | mkspecs/features/wasm/wasm.prf | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/QtWasmHelpers.cmake b/cmake/QtWasmHelpers.cmake index 6e2ff9bccc..a494725d7d 100644 --- a/cmake/QtWasmHelpers.cmake +++ b/cmake/QtWasmHelpers.cmake @@ -56,8 +56,8 @@ function (qt_internal_setup_wasm_target_properties wasmTarget) target_link_options("${wasmTarget}" INTERFACE "SHELL:-s DISABLE_EXCEPTION_CATCHING=${disable_exceptions_catching}") if (QT_FEATURE_thread) - target_compile_options("${wasmTarget}" INTERFACE "SHELL:-s USE_PTHREADS=1") - target_link_options("${wasmTarget}" INTERFACE "SHELL:-s USE_PTHREADS=1") + target_compile_options("${wasmTarget}" INTERFACE "SHELL:-pthread") + target_link_options("${wasmTarget}" INTERFACE "SHELL:-pthread") set(POOL_SIZE 4) if(DEFINED QT_WASM_PTHREAD_POOL_SIZE) diff --git a/mkspecs/features/wasm/wasm.prf b/mkspecs/features/wasm/wasm.prf index 8c1da8749a..06aea03d7d 100644 --- a/mkspecs/features/wasm/wasm.prf +++ b/mkspecs/features/wasm/wasm.prf @@ -9,7 +9,7 @@ exists($$QMAKE_QT_CONFIG) { qtConfig(thread) { - EMCC_THREAD_LFLAGS += -s USE_PTHREADS=1 + EMCC_THREAD_LFLAGS += -pthread # Create worker threads at startup. This is supposed to be an optimization, # however exceeding the pool size has been obesverved to hang the application. |