X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=inc%2FMakeMaker.pm;h=5263fd33c4bc8fde778cd8963f78acf7f6273453;hb=ea77684a76e30c02b0cd5512e322e6e29a6ac8e3;hp=254b97e4019e46c0e6ce157471cefaff6308651f;hpb=4fd8ee085ddf5f53628c2a69a936469ac4e66bce;p=gitmo%2FMoose.git

diff --git a/inc/MakeMaker.pm b/inc/MakeMaker.pm
index 254b97e..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,4 +30,13 @@ override _build_WriteMakefile_args => sub {
     };
 };
 
+override test => sub {
+    my $self = shift;
+
+    local $ENV{PERL5LIB} = join ':',
+        grep {defined} @ENV{ 'PERL5LIB', 'DZIL_TEST_INC' };
+
+    super();
+};
+
 1;