Skip to content

Commit dc2552d

Browse files
authored
gh-124928: Emscripten node support: Clean up old node <= 16 flags (#124929)
Clean up configure flags for old node versions These flags are only needed for node <= 16. Node 16 has been end of life since October of 2023.
1 parent 85799f1 commit dc2552d

File tree

4 files changed

+12
-83
lines changed

4 files changed

+12
-83
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Emscripten builds now require node >= 18.

Tools/wasm/emscripten/node_pre.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// If process is undefined, we're not running in the node runtime let it go I
2+
// guess?
3+
if (typeof process !== "undefined") {
4+
const nodeVersion = Number(process.versions.node.split('.',1)[0]);
5+
if (nodeVersion < 18) {
6+
process.stderr.write(`Node version must be >= 18, got version ${process.version}\n`);
7+
process.exit(1);
8+
}
9+
}

configure

Lines changed: 1 addition & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1622,34 +1622,6 @@ then
16221622
[Emscripten/node*], [
16231623
AC_PATH_TOOL([NODE], [node], [node])
16241624
HOSTRUNNER="$NODE"
1625-
# bigint for ctypes c_longlong, c_longdouble
1626-
# no longer available in Node 16
1627-
AC_CACHE_CHECK([for node --experimental-wasm-bigint], [ac_cv_tool_node_wasm_bigint], [
1628-
if $NODE -v --experimental-wasm-bigint > /dev/null 2>&1; then
1629-
ac_cv_tool_node_wasm_bigint=yes
1630-
else
1631-
ac_cv_tool_node_wasm_bigint=no
1632-
fi
1633-
])
1634-
AS_VAR_IF([ac_cv_tool_node_wasm_bigint], [yes], [
1635-
AS_VAR_APPEND([HOSTRUNNER], [" --experimental-wasm-bigint"])
1636-
])
1637-
1638-
AS_VAR_IF([enable_wasm_pthreads], [yes], [
1639-
AS_VAR_APPEND([HOSTRUNNER], [" --experimental-wasm-threads"])
1640-
# no longer available in Node 16
1641-
AC_CACHE_CHECK([for node --experimental-wasm-bulk-memory], [ac_cv_tool_node_wasm_bulk_memory], [
1642-
if $NODE -v --experimental-wasm-bulk-memory > /dev/null 2>&1; then
1643-
ac_cv_tool_node_wasm_bulk_memory=yes
1644-
else
1645-
ac_cv_tool_node_wasm_bulk_memory=no
1646-
fi
1647-
])
1648-
AS_VAR_IF([ac_cv_tool_node_wasm_bulk_memory], [yes], [
1649-
AS_VAR_APPEND([HOSTRUNNER], [" --experimental-wasm-bulk-memory"])
1650-
])
1651-
])
1652-
16531625
AS_VAR_IF([host_cpu], [wasm64], [AS_VAR_APPEND([HOSTRUNNER], [" --experimental-wasm-memory64"])])
16541626
],
16551627
dnl TODO: support other WASI runtimes
@@ -2424,6 +2396,7 @@ AS_CASE([$ac_sys_system],
24242396
],
24252397
[node*], [
24262398
AS_VAR_IF([ac_sys_emscripten_target], [node-debug], [wasm_debug=yes])
2399+
AS_VAR_APPEND([LDFLAGS_NODIST], [" --pre-js=\$(srcdir)/Tools/wasm/emscripten/node_pre.js"])
24272400
AS_VAR_APPEND([LDFLAGS_NODIST], [" -sALLOW_MEMORY_GROWTH -sNODERAWFS"])
24282401
AS_VAR_APPEND([LINKFORSHARED], [" -sEXIT_RUNTIME"])
24292402
WASM_LINKFORSHARED_DEBUG="-gseparate-dwarf --emit-symbol-map"

0 commit comments

Comments
 (0)