Skip to content

Commit 358304f

Browse files
committed
Breakup MakeMaker->new: check_PREREQ_FATAL method
1 parent 8567cfe commit 358304f

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

lib/ExtUtils/MakeMaker.pm

+16-11
Original file line numberDiff line numberDiff line change
@@ -456,17 +456,7 @@ sub new {
456456

457457
$self->extract_ARGV(\@ARGV);
458458

459-
# RT#91540 PREREQ_FATAL not recognized on command line
460-
if (%$unsatisfied_prereqs && $self->{PREREQ_FATAL}){
461-
my $failedprereqs = join "\n", map {" $_ $unsatisfied_prereqs->{$_}"}
462-
sort { $a cmp $b } keys %$unsatisfied_prereqs;
463-
die <<"END";
464-
MakeMaker FATAL: prerequisites not found.
465-
$failedprereqs
466-
467-
Please install these modules first and rerun 'perl Makefile.PL'.
468-
END
469-
}
459+
$self->check_PREREQ_FATAL($unsatisfied_prereqs); # after ARGV processed
470460

471461
$self->{NAME} ||= $self->guess_name;
472462
warn "Warning: NAME must be a package name\n"
@@ -486,6 +476,21 @@ END
486476
$self;
487477
}
488478

479+
sub check_PREREQ_FATAL {
480+
my ($self, $unsatisfied_prereqs) = @_;
481+
# RT#91540 PREREQ_FATAL not recognized on command line
482+
if (%$unsatisfied_prereqs && $self->{PREREQ_FATAL}){
483+
my $failedprereqs = join "\n", map {" $_ $unsatisfied_prereqs->{$_}"}
484+
sort { $a cmp $b } keys %$unsatisfied_prereqs;
485+
die <<"END";
486+
MakeMaker FATAL: prerequisites not found.
487+
$failedprereqs
488+
489+
Please install these modules first and rerun 'perl Makefile.PL'.
490+
END
491+
}
492+
}
493+
489494
sub extract_CONFIGURE {
490495
my ($self) = @_;
491496
my %initial_att = %$self; # record initial attributes

0 commit comments

Comments
 (0)