Re: MakeMaker doesn't pasthru DEFINE command-line args to subdirs on Win32

Message-ID: <3F2F7C55.9020808@uk.radan.com>

(The MM_Unix.pm part was dealt with in #20501.)

p4raw-id: //depot/perl@20502

diff --git a/lib/ExtUtils/MM_Win32.pm b/lib/ExtUtils/MM_Win32.pm
index d05c870..004694c 100644 (file)
--- a/lib/ExtUtils/MM_Win32.pm
+++ b/lib/ExtUtils/MM_Win32.pm
@@ -430,8 +430,10 @@ banner.
 
 sub pasthru {
     my($self) = shift;
-    return "PASTHRU = " . ($NMAKE ? "-nologo" : "");
-}
+    my $pasthru = $self->SUPER::pasthru();
+    $pasthru =~ s/PASTHRU\s*=\s*/PASTHRU = -nologo / if $NMAKE;
+    return $pasthru;                                                           
+ }
 
 
 =item oneliner (o)

diff --git a/lib/ExtUtils/t/MM_Win32.t b/lib/ExtUtils/t/MM_Win32.t
index 315b915..69e4afb 100644 (file)
--- a/lib/ExtUtils/t/MM_Win32.t
+++ b/lib/ExtUtils/t/MM_Win32.t
@@ -254,8 +254,8 @@ unlink "${script_name}$script_ext" if -f "${script_name}$script_ext";
 
 # pasthru()
 {
-    my $pastru = "PASTHRU = " . ($Config{make} =~ /^nmake/i ? "-nologo" : "");
-    is( $MM->pasthru(), $pastru, 'pasthru()' );
+    my $pasthru = ($Config{make} =~ /^nmake/i ? "/-nologo/" : "");
+    like( $MM->pasthru(), $pasthru, 'pasthru()' );
 }
 
 package FakeOut;