]> granicus.if.org Git - python/commitdiff
Issue #26271: Fix the Freeze tool to use variables passed in from the
authorBrett Cannon <brett@python.org>
Fri, 18 Mar 2016 17:29:43 +0000 (10:29 -0700)
committerBrett Cannon <brett@python.org>
Fri, 18 Mar 2016 17:29:43 +0000 (10:29 -0700)
configure script related to compiler flags.

Thanks to Daniel Shaulov for the bug report and patch.

Misc/ACKS
Misc/NEWS
Tools/freeze/makemakefile.py

index 85220d131941c0bc753f10c216a207dc639af29d..3f70eef71c0ef19ab0d6acdf74cc5344019d1e3a 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1326,6 +1326,7 @@ Mark Shannon
 Ha Shao
 Richard Shapiro
 Varun Sharma
+Daniel Shaulov
 Vlad Shcherbina
 Justin Sheehy
 Charlie Shepherd
index b8509ce2667c9606c26b1db8ce581c196fc1480a..3eef15a42e0e9192e1e5fada397686b71e579366 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -379,6 +379,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.
 
index 32e804c551e7544f0a8db66c3aa279fdd8a0148a..fa43fafe1e5c986eab0c098a7e89bd369cdb635e 100644 (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)