summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Misc/NEWS.d/next/Build/2021-12-09-10-25-11.bpo-46023.PLpNB6.rst2
-rwxr-xr-xModules/makesetup3
2 files changed, 5 insertions, 0 deletions
diff --git a/Misc/NEWS.d/next/Build/2021-12-09-10-25-11.bpo-46023.PLpNB6.rst b/Misc/NEWS.d/next/Build/2021-12-09-10-25-11.bpo-46023.PLpNB6.rst
new file mode 100644
index 0000000000..4ef9202559
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2021-12-09-10-25-11.bpo-46023.PLpNB6.rst
@@ -0,0 +1,2 @@
+:program:`makesetup` no longer builds extensions that have been marked as
+*disabled*. This allows users to disable modules in ``Modules/Setup.local``.
diff --git a/Modules/makesetup b/Modules/makesetup
index 2335724e80..6d83b8f0cb 100755
--- a/Modules/makesetup
+++ b/Modules/makesetup
@@ -206,6 +206,9 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
cpps="\$(MODULE_${mods_upper}_CFLAGS)"
libs="\$(MODULE_${mods_upper}_LDFLAGS)"
fi
+ case $DISABLED in
+ *$mods*) doconfig=disabled;;
+ esac
case $doconfig in
yes)
LIBS="$LIBS $libs"