X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=inc%2FMakeMaker.pm;h=5263fd33c4bc8fde778cd8963f78acf7f6273453;hb=706d2d376b483d4a0f50e8fb79cdce1dd9d0db9f;hp=114d17782c38b193343bf40edcfc5ba710a0b308;hpb=6bf5d14dc3eda832a81a0ad6fef0947518ad2aca;p=gitmo%2FMoose.git

diff --git a/inc/MakeMaker.pm b/inc/MakeMaker.pm
index 114d177..5263fd3 100644
--- 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;