Skip to content

Commit 432ec25

Browse files
committed
Rename xs_dynamic_lib param $from to $object
1 parent 040034c commit 432ec25

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

lib/ExtUtils/MM_Unix.pm

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -989,13 +989,13 @@ Defines the recipes for the C<dynamic_lib> section.
989989
=cut
990990

991991
sub xs_make_dynamic_lib {
992-
my ($self, $attribs, $from, $to, $todir, $ldfrom, $exportlist) = @_;
992+
my ($self, $attribs, $object, $to, $todir, $ldfrom, $exportlist) = @_;
993993
$exportlist = '' if $exportlist ne '$(EXPORT_LIST)';
994994
my $armaybe = $self->_xs_armaybe($attribs);
995-
my @m = sprintf '%s : %s $(MYEXTLIB) %s$(DFSEP).exists %s $(PERL_ARCHIVEDEP) $(PERL_ARCHIVE_AFTER) $(INST_DYNAMIC_DEP)'."\n", $to, $from, $todir, $exportlist;
995+
my @m = sprintf '%s : %s $(MYEXTLIB) %s$(DFSEP).exists %s $(PERL_ARCHIVEDEP) $(PERL_ARCHIVE_AFTER) $(INST_DYNAMIC_DEP)'."\n", $to, $object, $todir, $exportlist;
996996
if ($armaybe ne ':'){
997997
$ldfrom = 'tmp$(LIB_EXT)';
998-
push(@m," \$(ARMAYBE) cr $ldfrom $from\n");
998+
push(@m," \$(ARMAYBE) cr $ldfrom $object\n");
999999
push(@m," \$(RANLIB) $ldfrom\n");
10001000
}
10011001
$ldfrom = "-all $ldfrom -none" if $Is{OSF};
@@ -3579,11 +3579,12 @@ sub subdirs {
35793579
#### print "Including $dir subdirectory\n";
35803580
}
35813581
if (@m){
3582-
unshift(@m, "
3582+
unshift @m, <<'EOF';
3583+
35833584
# The default clean, realclean and test targets in this Makefile
35843585
# have automatically been given entries for each subdir.
35853586
3586-
");
3587+
EOF
35873588
} else {
35883589
push(@m, "\n# none")
35893590
}

0 commit comments

Comments
 (0)