diff --git a/[refs] b/[refs] index dcc1c96646ce..c66c049ad07e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1373411ae4cd0caf2e1a35fb801dd9a00b64dea2 +refs/heads/master: 07105202bdebf6e9a4c72c634cf90398abfad870 diff --git a/trunk/Makefile b/trunk/Makefile index 9f64552f09d6..5f333bf870f4 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -18,10 +18,9 @@ MAKEFLAGS += -rR --no-print-directory # Avoid funny character set dependencies unexport LC_ALL -LC_CTYPE=C LC_COLLATE=C LC_NUMERIC=C -export LC_CTYPE LC_COLLATE LC_NUMERIC +export LC_COLLATE LC_NUMERIC # We are using a recursive build, so we need to do a little thinking # to get the ordering right. diff --git a/trunk/arch/sh/tools/Makefile b/trunk/arch/sh/tools/Makefile index 558a56bcc7cf..2082af1f3fef 100644 --- a/trunk/arch/sh/tools/Makefile +++ b/trunk/arch/sh/tools/Makefile @@ -13,4 +13,4 @@ include/generated/machtypes.h: $(src)/gen-mach-types $(src)/mach-types @echo ' Generating $@' $(Q)mkdir -p $(dir $@) - $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; } + $(Q)LC_ALL=C $(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }