Integrate mainline 5.05_61

[p5sagit/p5-mst-13.2.git] / lib / ExtUtils / MM_Unix.pm

diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index 855a703..7c9657a 100644 (file)
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
@@ -389,7 +389,9 @@ sub cflags {
     }
 
     my $pollute = '';
-    if ($Config{usemymalloc} and $self->{PERL_MALLOC_OK}) {
+    if ($Config{usemymalloc} and not $Config{bincompat5005}
+       and not $Config{ccflags} =~ /-DPERL_POLLUTE_MALLOC\b/
+       and $self->{PERL_MALLOC_OK}) {
        $pollute = '$(PERL_MALLOC_DEF)';
     }