diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2022-01-12 22:24:10 +0100 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2022-01-17 09:01:20 +0000 |
| commit | f50dbdb38f0babc7dafba46f4a0d22e4d9186f38 (patch) | |
| tree | 8aea261dc1080fd934c8bafd1947e249ccd8050d /mkspecs | |
| parent | bb8c73ab9e26376170d6b18fa0bc5e9c0594b7f5 (diff) | |
| download | qtbase-f50dbdb38f0babc7dafba46f4a0d22e4d9186f38.tar.gz | |
wasm: don’t pass thread linker opts to compiler
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 <joerg.bornemann@qt.io>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/wasm/wasm.prf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/features/wasm/wasm.prf b/mkspecs/features/wasm/wasm.prf index 06aea03d7d..b80a565a2b 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 |