diff options
| author | Steve Hay <SteveHay@planit.com> | 2005-04-27 08:35:40 +0000 |
|---|---|---|
| committer | Steve Hay <SteveHay@planit.com> | 2005-04-27 08:35:40 +0000 |
| commit | 6383bd231af7f2656c299fa25c460180b9bf54b4 (patch) | |
| tree | 74423f565dee6f736383674f8b86cac36f434263 /lib | |
| parent | 88d019551b04ba7828be67e8c0f62de7f769b5d5 (diff) | |
| download | perl-6383bd231af7f2656c299fa25c460180b9bf54b4.tar.gz | |
Win32 MM test fix
From: Michael G Schwern <schwern@pobox.com>
Date: Mon, 18 Apr 2005 14:30:19 -0700
Message-ID: <20050418213019.GA15797@windhund.schwern.org>
Subject: Re: Win32 MM test fix
From: demerphq <demerphq@gmail.com>
Date: Tue, 19 Apr 2005 00:57:59 +0200
Message-ID: <9b18b31105041815573e10dc10@mail.gmail.com>
p4raw-id: //depot/perl@24334
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ExtUtils/MM_Unix.pm | 3 | ||||
| -rw-r--r-- | lib/ExtUtils/MM_Win32.pm | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm index 4e4326d5fb..34fec38db7 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm @@ -1921,7 +1921,8 @@ sub init_PERL { } # Are we building the core? - $self->{PERL_CORE} = 0 unless exists $self->{PERL_CORE}; + $self->{PERL_CORE} = $ENV{PERL_CORE} unless exists $self->{PERL_CORE}; + $self->{PERL_CORE} = 0 unless defined $self->{PERL_CORE}; # How do we run perl? foreach my $perl (qw(PERL FULLPERL ABSPERL)) { diff --git a/lib/ExtUtils/MM_Win32.pm b/lib/ExtUtils/MM_Win32.pm index 3839c24042..5e7f8e5f76 100644 --- a/lib/ExtUtils/MM_Win32.pm +++ b/lib/ExtUtils/MM_Win32.pm @@ -168,7 +168,7 @@ sub init_others { $self->{DEV_NULL} ||= '> NUL'; $self->{FIXIN} ||= $self->{PERL_CORE} ? - '$(PERLRUN) ../../win32/bin/pl2bat.pl' : + "\$(PERLRUN) $self->{PERL_SRC}/win32/bin/pl2bat.pl" : 'pl2bat.bat'; $self->{LD} ||= $Config{ld} || 'link'; |