[PATCH] ccwrap: fix build with non-english locale set

[Patrick Bendorf]

thanks eric.
just changed and tested it.
hopefully the last patch for this matter.

@corinna: as attachment to overcome previous problems.

patrick

Am 29.02.2016 um 16:41 schrieb Eric Blake:
> On 02/29/2016 06:19 AM, patrick bendorf wrote:
>> 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: change locale to 'C' as ccwrap searches for literal strings
>> "search starts here" and "End of search list" which may be localized.
>> ---
>>   winsup/ccwrap | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/winsup/ccwrap b/winsup/ccwrap
>> index 7580e7a..0c6a170 100755
>> --- a/winsup/ccwrap
>> +++ b/winsup/ccwrap
>> @@ -12,6 +12,7 @@ if ($ARGV[0] ne '++') {
>>       $cxx = 1;
>>   }
>>   die "$0: $ccorcxx environment variable does not exist\n" unless exists
>> $ENV{$ccorcxx};
>> +$ENV{'LANG'} = 'C';
> This won't work if I have LC_ALL set in my environment.  If you want to
> force the locale, you want to set LC_ALL (highest priority), not LANG
> (lowest priority).
>


-------------- next part --------------
From 826fd01518760279aec8c8e494a5d5d7fde28f0b Mon Sep 17 00:00:00 2001
From: patrick bendorf <mail@patrick-bendorf.de>
Date: Mon, 29 Feb 2016 17:21:20 +0100
Subject: [PATCH] /winsup/ * ccwrap: set LC_ALL instead of LANG to 'C' to force
 locale reliably

---
 winsup/ccwrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/winsup/ccwrap b/winsup/ccwrap
index 0c6a170..a7d2dd1 100755
--- a/winsup/ccwrap
+++ b/winsup/ccwrap
@@ -12,7 +12,7 @@ if ($ARGV[0] ne '++') {
     $cxx = 1;
 }
 die "$0: $ccorcxx environment variable does not exist\n" unless exists $ENV{$ccorcxx};
-$ENV{'LANG'} = 'C';
+$ENV{'LC_ALL'} = 'C';
 my @compiler = split ' ', $ENV{$ccorcxx};
 if ("@ARGV" !~ / -nostdinc/o) {
     my $fd;
-- 
2.7.0