aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-01-08 06:25:37 -0500
committerMichal Marek <mmarek@suse.cz>2010-01-13 07:27:24 -0500
commit07105202bdebf6e9a4c72c634cf90398abfad870 (patch)
tree0eec6777ac1e7a4d1282b5434d1602eb7767edc8
parent1373411ae4cd0caf2e1a35fb801dd9a00b64dea2 (diff)
Makefile: do not override LC_CTYPE
Setting LC_CTYPE=C breaks localized messages in some setups. With only LC_COLLATE=C and LC_NUMERIC=C, we get almost all we need, except for not so defined character classes and tolower()/toupper(). The former is not a big issue, because we can assume that e.g. [:alpha:] will always include a-zA-Z and we only ever process ASCII input. The latter seems only affect arch/sh/tools/gen-mach-types, which we can handle separately. So after this patch the meaning of ranges like [a-z], the behavior of sort and join, etc. should be the same everywhere and at the same time gcc should be able to print localized waring and error messages. LC_NUMERIC=C might not be necessary, but setting it doesn't hurt. Reported-by: Simon Horman <horms@verge.net.au> Reported-by: Sergei Trofimovich <slyfox@inbox.ru> Acked-by: H. Peter Anvin <hpa@zytor.com> Tested-by: Simon Horman <horms@verge.net.au> Tested-by: Masami Hiramatsu <mhiramat@redhat.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r--Makefile3
-rw-r--r--arch/sh/tools/Makefile2
2 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 9f64552f09d6..5f333bf870f4 100644
--- a/Makefile
+++ b/Makefile
@@ -18,10 +18,9 @@ MAKEFLAGS += -rR --no-print-directory
18 18
19# Avoid funny character set dependencies 19# Avoid funny character set dependencies
20unexport LC_ALL 20unexport LC_ALL
21LC_CTYPE=C
22LC_COLLATE=C 21LC_COLLATE=C
23LC_NUMERIC=C 22LC_NUMERIC=C
24export LC_CTYPE LC_COLLATE LC_NUMERIC 23export LC_COLLATE LC_NUMERIC
25 24
26# We are using a recursive build, so we need to do a little thinking 25# We are using a recursive build, so we need to do a little thinking
27# to get the ordering right. 26# to get the ordering right.
diff --git a/arch/sh/tools/Makefile b/arch/sh/tools/Makefile
index 558a56bcc7cf..2082af1f3fef 100644
--- a/arch/sh/tools/Makefile
+++ b/arch/sh/tools/Makefile
@@ -13,4 +13,4 @@
13include/generated/machtypes.h: $(src)/gen-mach-types $(src)/mach-types 13include/generated/machtypes.h: $(src)/gen-mach-types $(src)/mach-types
14 @echo ' Generating $@' 14 @echo ' Generating $@'
15 $(Q)mkdir -p $(dir $@) 15 $(Q)mkdir -p $(dir $@)
16 $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; } 16 $(Q)LC_ALL=C $(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }