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

diff --git a/Modules/Setup.bootstrap b/Modules/Setup.bootstrap
index d543f087b89fc2702b2edb17c314a03f01e2fa28..f23da60b37ad065feb7d2ac1727d51fdb171e876 100644 (file)
--- 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 6d83b8f0cbb7a49b56852490f25b3f742a7e410c..3909650ed7c417c6c1567000a603586e769fe9a3 100755 (executable)
--- 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)