Skip to content

Commit 2a4fa98

Browse files
hoodmanehoodmane
committed
pythongh-127111: Move link flags from LDFLAGS_NODIST to LINKFORSHARED
The `-sEXPORTED_FUNCTIONS` setting will break when linking a shared library because the library doesn't `main` or `Py_Version` symbols. Only that one _needs_ to be moved, but most of these other flags are ignored when linking a shared library so it's better not to pass them. The only one that needs to be passed when linking shared libraries is `-sWASM_BIGINT` which changes the ABI.
1 parent 6cf7794 commit 2a4fa98

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎configure‎

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

‎configure.ac‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2325,16 +2325,16 @@ AS_CASE([$ac_sys_system],
23252325
AS_VAR_IF([Py_DEBUG], [yes], [wasm_debug=yes], [wasm_debug=no])
23262326
23272327
dnl Start with 20 MB and allow to grow
2328-
AS_VAR_APPEND([LDFLAGS_NODIST], [" -sALLOW_MEMORY_GROWTH -sINITIAL_MEMORY=20971520"])
2328+
AS_VAR_APPEND([LINKFORSHARED], [" -sALLOW_MEMORY_GROWTH -sINITIAL_MEMORY=20971520"])
23292329
23302330
dnl map int64_t and uint64_t to JS bigint
23312331
AS_VAR_APPEND([LDFLAGS_NODIST], [" -sWASM_BIGINT"])
23322332
23332333
dnl Include file system support
2334-
AS_VAR_APPEND([LDFLAGS_NODIST], [" -sFORCE_FILESYSTEM -lidbfs.js -lnodefs.js -lproxyfs.js -lworkerfs.js"])
2335-
AS_VAR_APPEND([LDFLAGS_NODIST], [" -sEXPORTED_RUNTIME_METHODS=FS,callMain,ENV"])
2336-
AS_VAR_APPEND([LDFLAGS_NODIST], [" -sEXPORTED_FUNCTIONS=_main,_Py_Version"])
2337-
AS_VAR_APPEND([LDFLAGS_NODIST], [" -sSTACK_SIZE=5MB"])
2334+
AS_VAR_APPEND([LINKFORSHARED], [" -sFORCE_FILESYSTEM -lidbfs.js -lnodefs.js -lproxyfs.js -lworkerfs.js"])
2335+
AS_VAR_APPEND([LINKFORSHARED], [" -sEXPORTED_RUNTIME_METHODS=FS,callMain,ENV"])
2336+
AS_VAR_APPEND([LINKFORSHARED], [" -sEXPORTED_FUNCTIONS=_main,_Py_Version"])
2337+
AS_VAR_APPEND([LINKFORSHARED], [" -sSTACK_SIZE=5MB"])
23382338
23392339
AS_VAR_IF([enable_wasm_dynamic_linking], [yes], [
23402340
AS_VAR_APPEND([LINKFORSHARED], [" -sMAIN_MODULE"])

0 commit comments

Comments
 (0)