[Python-checkins] cpython (merge 3.5 -> 3.6): Merge 3.5

Thu Sep 29 16:38:23 EDT 2016

https://hg.python.org/cpython/rev/d1214c0dab49
changeset: 104165:d1214c0dab49
branch: 3.6
parent: 104162:1e29dca5dc4c
parent: 104164:17f2b6b2e24c
user: Victor Stinner <victor.stinner at gmail.com>
date: Thu Sep 29 22:31:20 2016 +0200
summary:
 Merge 3.5
files:
 Makefile.pre.in | 4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1630,6 +1630,10 @@
 		Modules/Setup Modules/Setup.local Modules/Setup.config \
 		Modules/ld_so_aix Modules/python.exp Misc/python.pc
 	-rm -f python*-gdb.py
+	# Issue #28258: set LC_ALL to avoid issues with Estonian locale.
+	# Expansion is performed here by shell (spawned by make) itself before
+	# arguments are passed to find. So LC_ALL=C must be set as a separate
+	# command.
 	LC_ALL=C; find $(srcdir)/[a-zA-Z]* '(' -name '*.fdc' -o -name '*~' \
 				 -o -name '[@,#]*' -o -name '*.old' \
 				 -o -name '*.orig' -o -name '*.rej' \
-- 
Repository URL: https://hg.python.org/cpython
