summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2021-12-14 14:42:46 (GMT)
committerGitHub <noreply@github.com>2021-12-14 14:42:46 (GMT)
commit74821b30539bba3cf0ac4148923ec0e9b826508e (patch)
tree3097187573b47c1f597c7e010b7c5b6cfa35a602 /Modules
parentd46d08d9474cb00b697dbdbb12cc7ce8f8ddfcec (diff)
downloadcpython-74821b30539bba3cf0ac4148923ec0e9b826508e.zip
cpython-74821b30539bba3cf0ac4148923ec0e9b826508e.tar.gz
cpython-74821b30539bba3cf0ac4148923ec0e9b826508e.tar.bz2
bpo-46023: Skip build if module is marked as DISABLED (GH-30100)
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Setup.bootstrap1
-rwxr-xr-xModules/makesetup5
2 files changed, 5 insertions, 1 deletions
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)