From 663c1b8827937562d714f85fa78b535896f726e7 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Thu, 18 Nov 2021 10:29:46 +1000 Subject: [PATCH] wasm: remove deprecated argument for source maps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -g4 was deprecated in Emscripten 2.0.17, and since we are well past that version we can safely use -gsource-map instead. Change-Id: I497155619d6320661f6be0e220b52fa7d6ca0b8e Reviewed-by: David Skoland Reviewed-by: Morten Johan Sørvig --- cmake/QtWasmHelpers.cmake | 2 +- mkspecs/features/wasm/wasm.prf | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/cmake/QtWasmHelpers.cmake b/cmake/QtWasmHelpers.cmake index 88161e767c3..6e2ff9bccc7 100644 --- a/cmake/QtWasmHelpers.cmake +++ b/cmake/QtWasmHelpers.cmake @@ -81,7 +81,7 @@ function (qt_internal_setup_wasm_target_properties wasmTarget) # Pass --source-map-base on the linker line. This informs the # browser where to find the source files when debugging. # -g4 to make source maps for debugging - target_link_options("${wasmTarget}" INTERFACE "-g4" "--source-map-base" "${WASM_SOURCE_MAP_BASE}") + target_link_options("${wasmTarget}" INTERFACE "-gsource-map" "--source-map-base" "${WASM_SOURCE_MAP_BASE}") endif() diff --git a/mkspecs/features/wasm/wasm.prf b/mkspecs/features/wasm/wasm.prf index 2629e962c86..8c1da8749ae 100644 --- a/mkspecs/features/wasm/wasm.prf +++ b/mkspecs/features/wasm/wasm.prf @@ -127,12 +127,7 @@ CONFIG(debug):!isEmpty(QT_WASM_SOURCE_MAP) { EMCC_VERSION = $$qtSystemEmccVersion() - greaterThan(EMCC_VERSION, 2.0.16) { - # emsdk 2.0.17 depreciates use of -g4 - QMAKE_LFLAGS += -gsource-map - } else { - QMAKE_LFLAGS += -g4 - } + QMAKE_LFLAGS += -gsource-map # Pass --source-map-base on the linker line. This informs the # browser where to find the source files when debugging. WASM_SOURCE_MAP_BASE = http://localhost:8000/