From f50dbdb38f0babc7dafba46f4a0d22e4d9186f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Wed, 12 Jan 2022 22:24:10 +0100 Subject: [PATCH] =?UTF-8?q?wasm:=20don=E2=80=99t=20pass=20thread=20linker?= =?UTF-8?q?=20opts=20to=20compiler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Emscripten now warns against passing e.g. “ALLOW_MEMORY_GROWTH” as a compile option. Add EMCC_THREAD_CFLAGS, which gets compiler flags only. Pick-to: 6.3 Change-Id: Ifcf40c45ca75cfdfc98a12e6b9d47f34158b3407 Reviewed-by: Joerg Bornemann Reviewed-by: Lorn Potter --- mkspecs/features/wasm/wasm.prf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/wasm/wasm.prf b/mkspecs/features/wasm/wasm.prf index 06aea03d7dd..b80a565a2b9 100644 --- a/mkspecs/features/wasm/wasm.prf +++ b/mkspecs/features/wasm/wasm.prf @@ -10,6 +10,7 @@ exists($$QMAKE_QT_CONFIG) { qtConfig(thread) { EMCC_THREAD_LFLAGS += -pthread + EMCC_THREAD_CFLAGS += -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. @@ -47,8 +48,8 @@ exists($$QMAKE_QT_CONFIG) { QMAKE_LFLAGS += $$EMCC_THREAD_LFLAGS QMAKE_LFLAGS_DEBUG += $$EMCC_THREAD_LFLAGS - QMAKE_CFLAGS += $$EMCC_THREAD_LFLAGS - QMAKE_CXXFLAGS += $$EMCC_THREAD_LFLAGS + QMAKE_CFLAGS += $$EMCC_THREAD_CFLAGS + QMAKE_CXXFLAGS += $$EMCC_THREAD_CFLAGS } # Create js and wasm files for applications