bpo-40280: Use Setup.stdlib static for wasm builds · python/cpython@216c132 · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 35.3k
• Star 75k

• Code
• Issues 5k+
• Pull requests 2.6k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 216c132

Browse filesBrowse the repository at this point in the historyBrowse files

tiran

committed

bpo-40280: Use Setup.stdlib static for wasm builds

1 parent 1052a39 commit 216c132
Copy full SHA for 216c132

3 files changed

+19-2Lines changed: 19 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Modules
  • Setup.stdlib.in
• configure.ac
• configure

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Modules/Setup.stdlib.in‎

Copy file name to clipboardExpand all lines: Modules/Setup.stdlib.in

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -22,8 +22,8 @@
22	22
23	23
24	24	# Build modules statically or as shared extensions
25		- *shared*
26		- # *static*
	25	+ # *shared* / *static*
	26	+ *@MODULE_BUILDTYPE@*
27	27
28	28
29	29	############################################################################

Collapse file

‎configure‎

Copy file name to clipboardExpand all lines: configure

+10Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -770,6 +770,7 @@ MODULE_TIME_FALSE
770	770	MODULE_TIME_TRUE
771	771	MODULE__IO_FALSE
772	772	MODULE__IO_TRUE
	773	+ MODULE_BUILDTYPE
773	774	TEST_MODULES
774	775	LIBRARY_DEPS
775	776	STATIC_LIBPYTHON
@@ -21012,6 +21013,15 @@ case $ac_sys_system in #(
21012	21013	;;
21013	21014	esac
21014	21015
	21016	+ case $host_cpu in #(
	21017	+ wasm32|wasm64) :
	21018	+ MODULE_BUILDTYPE=static ;; #(
	21019	+ *) :
	21020	+ MODULE_BUILDTYPE=${MODULE_BUILDTYPE:-shared}
	21021	+ ;;
	21022	+ esac
	21023	+
	21024	+
21015	21025
21016	21026	MODULE_BLOCK=
21017	21027

Collapse file

‎configure.ac‎

Copy file name to clipboardExpand all lines: configure.ac

+7Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -6185,6 +6185,13 @@ AS_CASE([$ac_sys_system],
6185	6185	[py_stdlib_not_available="_scproxy"]
6186	6186	)
6187	6187
	6188	+ dnl Default value for Modules/Setup.stdlib build type
	6189	+ AS_CASE([$host_cpu],
	6190	+ [wasm32|wasm64], [MODULE_BUILDTYPE=static],
	6191	+ [MODULE_BUILDTYPE=${MODULE_BUILDTYPE:-shared}]
	6192	+ )
	6193	+ AC_SUBST([MODULE_BUILDTYPE])
	6194	+
6188	6195	dnl _MODULE_BLOCK_ADD([VAR], [VALUE])
6189	6196	dnl internal: adds $1=quote($2) to MODULE_BLOCK
6190	6197	AC_DEFUN([_MODULE_BLOCK_ADD], [AS_VAR_APPEND([MODULE_BLOCK], ["$1=_AS_QUOTE([$2])$as_nl"])])

0 commit comments

Comments

0 (0)