diff options
| author | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-10-29 17:01:07 +0200 |
|---|---|---|
| committer | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-10-29 17:01:07 +0200 |
| commit | 0af10ac47255da68facef80aa1bbc9f9e11d745e (patch) | |
| tree | 393cba70673f7496b40fc8e3e44bbddec48772f3 /Modules/makesetup | |
| parent | 041794908b535d23b58b7cf22896d75a1c7ad04e (diff) | |
| parent | 0eacef3ecf84a2c41432f7a8be6304ab6427c35f (diff) | |
| download | cpython-git-0af10ac47255da68facef80aa1bbc9f9e11d745e.tar.gz | |
Issue #28444: Merge with 3.6.
Diffstat (limited to 'Modules/makesetup')
| -rwxr-xr-x | Modules/makesetup | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/makesetup b/Modules/makesetup index b87233758e..96b2aeca1f 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 |