Merge for issue #26271

This commit is contained in:
Brett Cannon 2016-03-18 10:30:21 -07:00
commit 32cba67b9f
3 changed files with 6 additions and 2 deletions

View File

@ -1333,6 +1333,7 @@ Mark Shannon
Ha Shao
Richard Shapiro
Varun Sharma
Daniel Shaulov
Vlad Shcherbina
Justin Sheehy
Charlie Shepherd

View File

@ -910,6 +910,9 @@ Windows
Tools/Demos
-----------
- Issue #26271: Fix the Freeze tool to properly use flags passed through
configure. Patch by Daniel Shaulov.
- Issue #26489: Add dictionary unpacking support to Tools/parser/unparse.py.
Patch by Guo Ci Teo.

View File

@ -17,12 +17,12 @@ def makemakefile(outfp, makevars, files, target):
base = os.path.basename(file)
dest = base[:-2] + '.o'
outfp.write("%s: %s\n" % (dest, file))
outfp.write("\t$(CC) $(CFLAGS) $(CPPFLAGS) -c %s\n" % file)
outfp.write("\t$(CC) $(PY_CFLAGS) $(PY_CPPFLAGS) -c %s\n" % file)
files[i] = dest
deps.append(dest)
outfp.write("\n%s: %s\n" % (target, ' '.join(deps)))
outfp.write("\t$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) %s -o %s $(LDLAST)\n" %
outfp.write("\t$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) %s -o %s $(LDLAST)\n" %
(' '.join(files), target))
outfp.write("\nclean:\n\t-rm -f *.o %s\n" % target)