summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorn Potter <lorn.potter@gmail.com>2019-07-02 12:28:25 +1000
committerLorn Potter <lorn.potter@gmail.com>2019-08-14 14:38:26 +1000
commit7a67a78d0528a30bbda1d5d321ea73d4af232c65 (patch)
treeec3125ed00a549279e551943c028855620c9d3d8
parentde26ea6a7ff921995b6229f1f683821adb95e973 (diff)
wasm: remove clamp mode for WASM_OBJECT_FILES builds
Change-Id: I2ddda7423c6546ab287111485da9c145ce7d31ea Fixes: QTBUG-76771 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
-rw-r--r--mkspecs/wasm-emscripten/qmake.conf5
1 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/wasm-emscripten/qmake.conf b/mkspecs/wasm-emscripten/qmake.conf
index c6c3af3622..992803e055 100644
--- a/mkspecs/wasm-emscripten/qmake.conf
+++ b/mkspecs/wasm-emscripten/qmake.conf
@@ -14,6 +14,8 @@ load(device_config)
QMAKE_CFLAGS += -s WASM_OBJECT_FILES=$$WASM_OBJECT_FILES
QMAKE_CXXFLAGS += -s WASM_OBJECT_FILES=$$WASM_OBJECT_FILES
QMAKE_LFLAGS += -s WASM_OBJECT_FILES=$$WASM_OBJECT_FILES
+} else {
+ EMCC_COMMON_LFLAGS += -s \"BINARYEN_TRAP_MODE=\'clamp\'\"
}
EMTERP_FLAGS = \
@@ -29,8 +31,7 @@ EMCC_COMMON_LFLAGS = \
-s USE_WEBGL2=1 \
-s NO_EXIT_RUNTIME=0 \
-s ERROR_ON_UNDEFINED_SYMBOLS=1 \
- --bind \
- -s \"BINARYEN_TRAP_MODE=\'clamp\'\"
+ --bind
# The -s arguments can also be used with release builds,
# but are here in debug for clarity.