Skip to content

Commit b324e60

Browse files
jkahrmanbingos
authored andcommitted
Remove NeXT support
DynaLoader dropped support for NeXT in 2014 in Perl 5.21 Perl/perl5@f05550c
1 parent b29d3ea commit b324e60

File tree

2 files changed

+10
-40
lines changed

2 files changed

+10
-40
lines changed

lib/ExtUtils/Liblist/Kid.pm

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ sub _unix_os2_ext {
6464
}
6565
@libpath = grep -d, @libpath;
6666

67-
if ( $^O eq 'darwin' or $^O eq 'next' ) {
67+
if ($^O eq 'darwin') {
6868
# 'escape' Mach-O ld -framework and -F flags, so they aren't dropped later on
6969
$potential_libs =~ s/(^|\s)(-(?:weak_|reexport_|lazy_)?framework)\s+(\S+)/$1-Wl,$2 -Wl,$3/g;
7070
$potential_libs =~ s/(^|\s)(-F)\s*(\S+)/$1-Wl,$2 -Wl,$3/g;
@@ -164,7 +164,7 @@ sub _unix_os2_ext {
164164
} @fullname
165165
)[0];
166166
}
167-
elsif ( -f ( $fullname = "$thispth/lib$thislib.$so" ))
167+
elsif ( -f ( $fullname = "$thispth/lib$thislib.$so" ) )
168168
{
169169
}
170170
elsif (-f ( $fullname = "$thispth/lib${thislib}_s$Config_libext" )
@@ -232,41 +232,18 @@ sub _unix_os2_ext {
232232

233233
# Do not add it into the list if it is already linked in
234234
# with the main perl executable.
235-
# We have to special-case the NeXT, because math and ndbm
236-
# are both in libsys_s
237-
unless (
238-
$in_perl
239-
|| ( $Config{'osname'} eq 'next'
240-
&& ( $thislib eq 'm' || $thislib eq 'ndbm' ) )
241-
)
242-
{
243-
push( @extralibs, "-l$custom_name$thislib" );
244-
}
235+
push( @extralibs, "-l$custom_name$thislib" )
236+
unless $in_perl;
245237

246-
# We might be able to load this archive file dynamically
247-
if ($Config{'dlsrc'} =~ /dl_next/ && $Config{'osvers'} lt '4_0')
248-
{
238+
if ( $is_dyna ) {
249239

250-
# We push -l$thislib instead of $fullname because
251-
# it avoids hardwiring a fixed path into the .bs file.
252-
# Mkbootstrap will automatically add dl_findfile() to
253-
# the .bs file if it sees a name in the -l format.
254-
# USE THIS, when dl_findfile() is fixed:
255-
# push(@bsloadlibs, "-l$thislib");
256-
# OLD USE WAS while checking results against old_extliblist
257-
push( @bsloadlibs, "$fullname" );
240+
# For SunOS4, do not add in this shared library if
241+
# it is already linked in the main perl executable
242+
push( @ldloadlibs, "-l$custom_name$thislib" )
243+
unless ( $in_perl and $^O eq 'sunos' );
258244
}
259245
else {
260-
if ( $is_dyna ) {
261-
262-
# For SunOS4, do not add in this shared library if
263-
# it is already linked in the main perl executable
264-
push( @ldloadlibs, "-l$custom_name$thislib" )
265-
unless ( $in_perl and $^O eq 'sunos' );
266-
}
267-
else {
268-
push( @ldloadlibs, "-l$custom_name$thislib" );
269-
}
246+
push( @ldloadlibs, "-l$custom_name$thislib" );
270247
}
271248
last; # found one here so don't bother looking further
272249
}

lib/ExtUtils/MM_Unix.pm

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1925,13 +1925,6 @@ EOP
19251925
$once_only{$m} = 1;
19261926
}
19271927

1928-
# This is too dangerous:
1929-
# if ($^O eq "next") {
1930-
# $self->{AR} = "libtool";
1931-
# $self->{AR_STATIC_ARGS} = "-o";
1932-
# }
1933-
# But I leave it as a placeholder
1934-
19351928
$self->{AR_STATIC_ARGS} ||= "cr";
19361929

19371930
# These should never be needed

0 commit comments

Comments
 (0)