From 2cd76694e1d7021759cca8f940092186530dfdae Mon Sep 17 00:00:00 2001
From: Patrick Bendorf <mail@patrick-bendorf.de>
Date: Mon, 29 Feb 2016 14:34:09 +0100
Subject: [PATCH] ccwrap: fix build with non-english locale set (v2)

after some discussion on irc and the list i'm resubmitting a simpler
version of the patch.
setting the locale on cygwin to 'C.UTF-8' is not needed, so i'm always
setting it to 'C' which is sufficient for the build process and the
most simple fix.
---
 winsup/ccwrap | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/winsup/ccwrap b/winsup/ccwrap
index 2f1fd3a98..0c6a17020 100755
--- a/winsup/ccwrap
+++ b/winsup/ccwrap
@@ -12,11 +12,7 @@ if ($ARGV[0] ne '++') {
     $cxx = 1;
 }
 die "$0: $ccorcxx environment variable does not exist\n" unless exists $ENV{$ccorcxx};
-if (`uname -o` =~ /cygwin/i) {
-    $ENV{'LANG'} = 'C.UTF-8';
-} else {
-    $ENV{'LANG'} = 'C';
-}
+$ENV{'LANG'} = 'C';
 my @compiler = split ' ', $ENV{$ccorcxx};
 if ("@ARGV" !~ / -nostdinc/o) {
     my $fd;