diff options
| author | Steve Hay <SteveHay@planit.com> | 2003-08-05 11:43:49 +0100 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2003-08-05 15:32:39 +0000 |
| commit | 0a7c666e19ecbf1103304b30268ae2c69de61220 (patch) | |
| tree | da4ab8d3116c984585560221f0dd343e3917b758 /lib/ExtUtils | |
| parent | ed4c9df05c168d15d8f1451d9eacda57ad48da88 (diff) | |
| download | perl-0a7c666e19ecbf1103304b30268ae2c69de61220.tar.gz | |
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
Diffstat (limited to 'lib/ExtUtils')
| -rw-r--r-- | lib/ExtUtils/MM_Win32.pm | 6 | ||||
| -rw-r--r-- | lib/ExtUtils/t/MM_Win32.t | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/ExtUtils/MM_Win32.pm b/lib/ExtUtils/MM_Win32.pm index d05c87054b..004694c15b 100644 --- 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 315b9158cf..69e4afb04c 100644 --- 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; |