[Python-checkins] cpython (merge 3.5 -> default): Merge for issue #26271

Fri Mar 18 13:41:06 EDT 2016

https://hg.python.org/cpython/rev/364895e54bb0
changeset: 100590:364895e54bb0
parent: 100588:11f920264454
parent: 100589:599328247e84
user: Brett Cannon <brett at python.org>
date: Fri Mar 18 10:30:21 2016 -0700
summary:
 Merge for issue #26271
files:
 Misc/ACKS | 1 +
 Misc/NEWS | 3 +++
 Tools/freeze/makemakefile.py | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1333,6 +1333,7 @@
 Ha Shao
 Richard Shapiro
 Varun Sharma
+Daniel Shaulov
 Vlad Shcherbina
 Justin Sheehy
 Charlie Shepherd
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -910,6 +910,9 @@
 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.
 
diff --git a/Tools/freeze/makemakefile.py b/Tools/freeze/makemakefile.py
--- a/Tools/freeze/makemakefile.py
+++ b/Tools/freeze/makemakefile.py
@@ -17,12 +17,12 @@
 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)
-- 
Repository URL: https://hg.python.org/cpython
