1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: remove deprecated argument for source maps

Browse Source 
-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 <david.skoland@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Lorn Potter 2021-11-18 10:29:46 +10:00
parent 81a31beeb2
commit 663c1b8827
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtWasmHelpers.cmake
View File

@ -81,7 +81,7 @@ function (qt_internal_setup_wasm_target_properties wasmTarget)
# Pass --source-map-base on the linker line. This informs the # Pass --source-map-base on the linker line. This informs the
# browser where to find the source files when debugging. # browser where to find the source files when debugging.
# -g4 to make source maps for 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() endif()

7
mkspecs/features/wasm/wasm.prf
View File

@ -127,12 +127,7 @@ CONFIG(debug):!isEmpty(QT_WASM_SOURCE_MAP) {
EMCC_VERSION = $$qtSystemEmccVersion() EMCC_VERSION = $$qtSystemEmccVersion()
greaterThan(EMCC_VERSION, 2.0.16) { QMAKE_LFLAGS += -gsource-map
# emsdk 2.0.17 depreciates use of -g4
QMAKE_LFLAGS += -gsource-map
} else {
QMAKE_LFLAGS += -g4
}
# Pass --source-map-base on the linker line. This informs the # Pass --source-map-base on the linker line. This informs the
# browser where to find the source files when debugging. # browser where to find the source files when debugging.
WASM_SOURCE_MAP_BASE = http://localhost:8000/ WASM_SOURCE_MAP_BASE = http://localhost:8000/