Skip to content

Commit

Permalink
bpo-40280: Use Setup.stdlib static for wasm builds (GH-29784)
Browse files Browse the repository at this point in the history
``Modules/Setup.stdlib`` contains ``Setup`` lines for all stdlib extension modules for which ``configure`` has detected their dependencies. The file is not used yet and still under development. To use the file, do ``ln -sfr Modules/Setup.stdlib Modules/Setup.local``.
  • Loading branch information
tiran authored Nov 26, 2021
1 parent cd876c8 commit ee1e2c6
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Modules/Setup.stdlib.in
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@


# Build modules statically or as shared extensions
*shared*
# *static*
# *shared* / *static*
*@MODULE_BUILDTYPE@*


############################################################################
Expand Down
10 changes: 10 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -770,6 +770,7 @@ MODULE_TIME_FALSE
MODULE_TIME_TRUE
MODULE__IO_FALSE
MODULE__IO_TRUE
MODULE_BUILDTYPE
TEST_MODULES
LIBRARY_DEPS
STATIC_LIBPYTHON
Expand Down Expand Up @@ -21012,6 +21013,15 @@ case $ac_sys_system in #(
;;
esac

case $host_cpu in #(
wasm32|wasm64) :
MODULE_BUILDTYPE=static ;; #(
*) :
MODULE_BUILDTYPE=${MODULE_BUILDTYPE:-shared}
;;
esac



MODULE_BLOCK=

Expand Down
7 changes: 7 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -6185,6 +6185,13 @@ AS_CASE([$ac_sys_system],
[py_stdlib_not_available="_scproxy"]
)

dnl Default value for Modules/Setup.stdlib build type
AS_CASE([$host_cpu],
[wasm32|wasm64], [MODULE_BUILDTYPE=static],
[MODULE_BUILDTYPE=${MODULE_BUILDTYPE:-shared}]
)
AC_SUBST([MODULE_BUILDTYPE])

dnl _MODULE_BLOCK_ADD([VAR], [VALUE])
dnl internal: adds $1=quote($2) to MODULE_BLOCK
AC_DEFUN([_MODULE_BLOCK_ADD], [AS_VAR_APPEND([MODULE_BLOCK], ["$1=_AS_QUOTE([$2])$as_nl"])])
Expand Down

0 comments on commit ee1e2c6

Please sign in to comment.