Mark two more known-broken distros

[gitmo/Moose.git] / inc / MakeMaker.pm

diff --git a/inc/MakeMaker.pm b/inc/MakeMaker.pm
index 114d177..5263fd3 100644 (file)
--- a/inc/MakeMaker.pm
+++ b/inc/MakeMaker.pm
@@ -13,6 +13,9 @@ override _build_MakeFile_PL_template => sub {
 
     my $tmpl = super();
 
+    my $ccflags = MMHelper::ccflags_dyn();
+    $tmpl =~ s/^(WriteMakefile\()/\$WriteMakefileArgs{CCFLAGS} = $ccflags;\n\n$1/m;
+
     return $tmpl . "\n\n" . MMHelper::my_package_subs();
 };
 
@@ -27,7 +30,13 @@ override _build_WriteMakefile_args => sub {
     };
 };
 
-1;
+override test => sub {
+    my $self = shift;
 
+    local $ENV{PERL5LIB} = join ':',
+        grep {defined} @ENV{ 'PERL5LIB', 'DZIL_TEST_INC' };
 
+    super();
+};
 
+1;