From 74821b30539bba3cf0ac4148923ec0e9b826508e Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Tue, 14 Dec 2021 16:42:46 +0200 Subject: bpo-46023: Skip build if module is marked as DISABLED (GH-30100) --- Modules/Setup.bootstrap | 1 + Modules/makesetup | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Modules/Setup.bootstrap b/Modules/Setup.bootstrap index d543f08..f23da60 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 6d83b8f..3909650 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) -- cgit v0.12