[Python-checkins] bpo-46023: Skip build if module is marked as DISABLED (GH-30100)

[tiran]

https://github.com/python/cpython/commit/74821b30539bba3cf0ac4148923ec0e9b826508e
commit: 74821b30539bba3cf0ac4148923ec0e9b826508e
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2021-12-14T15:42:46+01:00
summary:

bpo-46023: Skip build if module is marked as DISABLED (GH-30100)

files:
M Modules/Setup.bootstrap
M Modules/makesetup

diff --git a/Modules/Setup.bootstrap b/Modules/Setup.bootstrap
index d543f087b89fc..f23da60b37ad0 100644
--- a/Modules/Setup.bootstrap
+++ b/Modules/Setup.bootstrap
@@ -3,6 +3,7 @@
 # ---
 # Built-in modules required to get a functioning interpreter;
 # cannot be built as shared!
+*static*
 
 # module C APIs are used in core
 atexit atexitmodule.c
diff --git a/Modules/makesetup b/Modules/makesetup
index 6d83b8f0cbb7a..3909650ed7c41 100755
--- a/Modules/makesetup
+++ b/Modules/makesetup
@@ -207,7 +207,10 @@ sed -e 's/[ 	]*#.*//' -e '/^[ 	]*$/d' |
 			libs="\$(MODULE_${mods_upper}_LDFLAGS)"
 		fi
 		case $DISABLED in
-		*$mods*) doconfig=disabled;;
+		*$mods*)
+			# disabled by previous rule / Setup file
+			continue
+			;;
 		esac
 		case $doconfig in
 		yes)