Skip to content

Commit b384e13

Browse files
committed
fix $archname in ExtUtils::MakeMaker
1 parent 0dc7a73 commit b384e13

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3255,7 +3255,10 @@ PPD_PERLVERS
32553255
# archname did not change from 5.6 to 5.8, but those versions may
32563256
# not be not binary compatible so now we append the part of the
32573257
# version that changes when binary compatibility may change
3258-
if ("$]" >= 5.008) {
3258+
if ("$]" >= 41) {
3259+
$archname .= "-$Config{api_version}";
3260+
}
3261+
elsif ("$]" >= 5.008) {
32593262
$archname .= "-$Config{api_revision}.$Config{api_version}";
32603263
}
32613264
push @ppd_chunks, sprintf <<'PPD_OUT', $archname;

cpan/ExtUtils-MakeMaker/t/basic.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ unlike( $ppd_html, qr{^\s*<REQUIRE NAME="warnings::" />}m, 'no <REQUIRE> for bu
134134

135135
my $archname = $Config{archname};
136136
# XXX This is a copy of the internal logic, so it's not a great test
137-
if( "$]" >= 5.010) {
138-
$archname .= "-$^V->{version}->[0].$^V->{version}->[1]";
137+
if( "$]" >= 41 ) {
138+
$archname .= "-$Config{PERL_VERSION}";
139139
}
140140
elsif( "$]" >= 5.008 ) {
141141
$archname .= "-$Config{PERL_REVISION}.$Config{PERL_VERSION}";

0 commit comments

Comments
 (0)