https://github.com/python/cpython/commit/be07edf511365ce554c0535b535bb5726266a17a
commit: be07edf511365ce554c0535b535bb5726266a17a
branch: main
author: Hood Chatham <[email protected]>
committer: freakboy3742 <[email protected]>
date: 2024-12-09T09:34:28+08:00
summary:
gh-127111: Emscripten Move link flags from `LDFLAGS_NODIST` to `LINKFORSHARED`
(#127666)
Corrects the usage of linking flags to avoid compilation errors related to the
use of `-sEXPORTED_FUNCTIONS` when linking shared libraries.
files:
M configure
M configure.ac
diff --git a/configure b/configure
index bcbab8dfcff190..57be576e3cae99 100755
--- a/configure
+++ b/configure
@@ -9430,14 +9430,14 @@ else $as_nop
wasm_debug=no
fi
- as_fn_append LDFLAGS_NODIST " -sALLOW_MEMORY_GROWTH
-sINITIAL_MEMORY=20971520"
+ as_fn_append LINKFORSHARED " -sALLOW_MEMORY_GROWTH
-sINITIAL_MEMORY=20971520"
as_fn_append LDFLAGS_NODIST " -sWASM_BIGINT"
- as_fn_append LDFLAGS_NODIST " -sFORCE_FILESYSTEM -lidbfs.js
-lnodefs.js -lproxyfs.js -lworkerfs.js"
- as_fn_append LDFLAGS_NODIST " -sEXPORTED_RUNTIME_METHODS=FS,callMain,ENV"
- as_fn_append LDFLAGS_NODIST " -sEXPORTED_FUNCTIONS=_main,_Py_Version"
- as_fn_append LDFLAGS_NODIST " -sSTACK_SIZE=5MB"
+ as_fn_append LINKFORSHARED " -sFORCE_FILESYSTEM -lidbfs.js -lnodefs.js
-lproxyfs.js -lworkerfs.js"
+ as_fn_append LINKFORSHARED " -sEXPORTED_RUNTIME_METHODS=FS,callMain,ENV"
+ as_fn_append LINKFORSHARED " -sEXPORTED_FUNCTIONS=_main,_Py_Version"
+ as_fn_append LINKFORSHARED " -sSTACK_SIZE=5MB"
if test "x$enable_wasm_dynamic_linking" = xyes
then :
diff --git a/configure.ac b/configure.ac
index 922a125ea9608e..bd0221481c5341 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2325,16 +2325,16 @@ AS_CASE([$ac_sys_system],
AS_VAR_IF([Py_DEBUG], [yes], [wasm_debug=yes], [wasm_debug=no])
dnl Start with 20 MB and allow to grow
- AS_VAR_APPEND([LDFLAGS_NODIST], [" -sALLOW_MEMORY_GROWTH
-sINITIAL_MEMORY=20971520"])
+ AS_VAR_APPEND([LINKFORSHARED], [" -sALLOW_MEMORY_GROWTH
-sINITIAL_MEMORY=20971520"])
dnl map int64_t and uint64_t to JS bigint
AS_VAR_APPEND([LDFLAGS_NODIST], [" -sWASM_BIGINT"])
dnl Include file system support
- AS_VAR_APPEND([LDFLAGS_NODIST], [" -sFORCE_FILESYSTEM -lidbfs.js
-lnodefs.js -lproxyfs.js -lworkerfs.js"])
- AS_VAR_APPEND([LDFLAGS_NODIST], ["
-sEXPORTED_RUNTIME_METHODS=FS,callMain,ENV"])
- AS_VAR_APPEND([LDFLAGS_NODIST], ["
-sEXPORTED_FUNCTIONS=_main,_Py_Version"])
- AS_VAR_APPEND([LDFLAGS_NODIST], [" -sSTACK_SIZE=5MB"])
+ AS_VAR_APPEND([LINKFORSHARED], [" -sFORCE_FILESYSTEM -lidbfs.js
-lnodefs.js -lproxyfs.js -lworkerfs.js"])
+ AS_VAR_APPEND([LINKFORSHARED], ["
-sEXPORTED_RUNTIME_METHODS=FS,callMain,ENV"])
+ AS_VAR_APPEND([LINKFORSHARED], [" -sEXPORTED_FUNCTIONS=_main,_Py_Version"])
+ AS_VAR_APPEND([LINKFORSHARED], [" -sSTACK_SIZE=5MB"])
AS_VAR_IF([enable_wasm_dynamic_linking], [yes], [
AS_VAR_APPEND([LINKFORSHARED], [" -sMAIN_MODULE"])
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
