summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorXavier de Gaye <xdegaye@users.sourceforge.net>2016-10-29 14:57:20 (GMT)
committerXavier de Gaye <xdegaye@users.sourceforge.net>2016-10-29 14:57:20 (GMT)
commit84968b74c89aa22759b8e284673b46a4a69db852 (patch)
treea076c70bdb303377ef833fe874c578bba653a219 /Modules
parent43ab355e0e6da10441a0f145a0d76f8c3d379589 (diff)
downloadcpython-84968b74c89aa22759b8e284673b46a4a69db852.zip
cpython-84968b74c89aa22759b8e284673b46a4a69db852.tar.gz
cpython-84968b74c89aa22759b8e284673b46a4a69db852.tar.bz2
Issue #28444: Fix missing extensions modules when cross compiling.
Diffstat (limited to 'Modules')
-rwxr-xr-xModules/makesetup5
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/makesetup b/Modules/makesetup
index 3297b78..e204a05 100755
--- a/Modules/makesetup
+++ b/Modules/makesetup
@@ -29,6 +29,7 @@
#
# Copying Makefile.pre to Makefile:
# - insert an identifying comment at the start
+# - replace _MODNAMES_ by the list of modules from Setup
# - replace _MODOBJS_ by the list of objects from Setup (except for
# Setup files after a -n option)
# - replace _MODLIBS_ by the list of libraries from Setup
@@ -110,6 +111,7 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
# Rules appended by makedepend
" >$rulesf
DEFS=
+ NAMES=
MODS=
SHAREDMODS=
OBJS=
@@ -181,7 +183,7 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
*.*) echo 1>&2 "bad word $arg in $line"
exit 1;;
-u) skip=libs; libs="$libs -u";;
- [a-zA-Z_]*) mods="$mods $arg";;
+ [a-zA-Z_]*) NAMES="$NAMES $arg"; mods="$mods $arg";;
*) echo 1>&2 "bad word $arg in $line"
exit 1;;
esac
@@ -280,6 +282,7 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
echo "1i\\" >$sedf
str="# Generated automatically from $makepre by makesetup."
echo "$str" >>$sedf
+ echo "s%_MODNAMES_%$NAMES%" >>$sedf
echo "s%_MODOBJS_%$OBJS%" >>$sedf
echo "s%_MODLIBS_%$LIBS%" >>$sedf
echo "/Definitions added by makesetup/a$NL$NL$DEFS" >>$sedf