--- perl-5.22.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.cflags 2015-05-16 15:23:24.000000000 +0300 +++ perl-5.22.0/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 2015-06-21 00:32:52.103613358 +0300 @@ -265,7 +265,11 @@ $cflags{$_} =~ s/^\s+//; $cflags{$_} =~ s/\s+/ /g; $cflags{$_} =~ s/\s+$//; - $self->{uc $_} ||= $cflags{$_}; + if (/ccflags/ && $self->{uc $_}) { + $self->{uc $_} = "$cflags{$_} " . $self->{uc $_}; + } else { + $self->{uc $_} ||= $cflags{$_}; + } } if ($self->{POLLUTE}) { --- perl-5.22.0/cpan/ExtUtils-MakeMaker/t/MM_Unix.t.cflags 2015-05-13 23:19:28.000000000 +0300 +++ perl-5.22.0/cpan/ExtUtils-MakeMaker/t/MM_Unix.t 2015-06-21 00:40:54.775753511 +0300 @@ -12,7 +12,7 @@ plan skip_all => 'Non-Unix platform'; } else { - plan tests => 110; + plan tests => 111; } } @@ -20,6 +20,7 @@ use strict; use File::Spec; +use Config; my $class = 'ExtUtils::MM_Unix'; @@ -221,5 +222,6 @@ # Brief bug where CCFLAGS was being blown away like( $t->{CCFLAGS}, qr/\-DMY_THING/, 'cflags retains CCFLAGS' ); + like( $t->{CCFLAGS}, "/\Q$Config{ccflags}\E/", 'cflags does not override $Config{ccflags} with CCFLAGS' ); }