@@ -134,11 +134,6 @@ $Is_VMS = $^O eq 'VMS';
134
134
<</$^O-eq-VMS>>
135
135
$do_expand = <<$^O-eq-VMS>>1<<|$^O-eq-VMS>>0<</$^O-eq-VMS>>;
136
136
137
- <<$^O-eq-MacOS>>
138
- my $Mac_FS ;
139
- $Mac_FS = eval { require Mac ::FileSpec ::Unixish };
140
- <</$^O -eq -MacOS >>
141
-
142
137
@dl_require_symbols = (); # names of symbols we need
143
138
@dl_resolve_using = (); # names of files to link with
144
139
@dl_library_path = (); # path to look for files
@@ -312,30 +307,20 @@ sub bootstrap {
312
307
}
313
308
<</$^O -eq -NetWare >>
314
309
315
- my $modpname = join(<<$^ O - eq - MacOS >> ':' <<|$^ O - eq - MacOS >> '/' <</$^ O - eq - MacOS >> ,@modparts );
310
+ my $modpname = join('/' ,@modparts );
316
311
317
312
print STDERR "DynaLoader::bootstrap for $module " ,
318
- <<$^O -eq -MacOS >> "(:auto:$modpname:$modfname.$dl_dlext)\n"
319
- <<|$^O -eq -MacOS >>"(auto/$modpname/$modfname.$dl_dlext)\n" <</$^O -eq -MacOS >>
313
+ "(auto/$modpname/$modfname.$dl_dlext)\n"
320
314
if $dl_debug ;
321
315
322
316
foreach (@INC ) {
323
317
<<$^O -eq -VMS >>chop($_ = VMS ::Filespec ::unixpath($_ ));<</$^O -eq -VMS >>
324
- <<$^O -eq -MacOS >>
325
- my $path = $_ ;
326
- if ($Mac_FS && ! -d $path ) {
327
- $path = Mac ::FileSpec ::Unixish ::nativize($path );
328
- }
329
- $path . = ":" unless /:$/;
330
- my $dir = "${path}auto:$modpname" ;
331
- <<|$^O -eq -MacOS >>
332
318
my $dir = "$_/auto/$modpname" ;
333
- <</$^O -eq -MacOS >>
334
319
335
320
next unless -d $dir ; # skip over uninteresting directories
336
321
337
322
# check for common cases to avoid autoload of dl_findfile
338
- my $try = <<$^ O - eq - MacOS >> "$dir:$modfname.$dl_dlext" <<|$^ O - eq - MacOS >> "$dir /$modfname.$dl_dlext"<</$^ O - eq - MacOS >> ;
323
+ my $try = "$dir/$modfname.$dl_dlext" ;
339
324
last if $file = ($do_expand ) ? dl_expandspec($try ) : ((-f $try ) && $try );
340
325
341
326
# no luck here , save dir for possible later dl_findfile search
@@ -439,12 +424,6 @@ sub dl_findfile {
439
424
next ;
440
425
}
441
426
<</$^O -eq -VMS >>
442
- <<$^O -eq -MacOS >>
443
- if (m /:/ && -f $_ ) {
444
- push(@found ,$_ );
445
- last arg unless wantarray ;
446
- }
447
- <</$^O -eq -MacOS >>
448
427
<<$^O -ne -VMS >>
449
428
if (m :/: && -f $_ ) {
450
429
push(@found ,$_ );
@@ -457,30 +436,6 @@ sub dl_findfile {
457
436
# Using a -L prefix is the preferred option (faster and more robust )
458
437
if (m :^-L :) { s /^-L //; push(@dirs , $_ ); next ; }
459
438
460
- <<$^O -eq -MacOS >>
461
- # Otherwise we try to try to spot directories by a heuristic
462
- # (this is a more complicated issue than it first appears )
463
- if (m /:/ && -d $_ ) { push(@dirs , $_ ); next ; }
464
- # Only files should get this far . ..
465
- my (@names , $name ); # what filenames to look for
466
- s /^-l //;
467
- push(@names , $_ );
468
- foreach $dir (@dirs , @dl_library_path ) {
469
- next unless -d $dir ;
470
- $dir =~ s /^([^:]+)$/:$1 /;
471
- $dir =~ s /:$//;
472
- foreach $name (@names ) {
473
- my($file ) = "$dir:$name" ;
474
- print STDERR " checking in $dir for $name\n" if $dl_debug ;
475
- if (-f $file ) {
476
- push(@found , $file );
477
- next arg ; # no need to look any further
478
- }
479
- }
480
- }
481
- next ;
482
- <</$^O -eq -MacOS >>
483
-
484
439
# Otherwise we try to try to spot directories by a heuristic
485
440
# (this is a more complicated issue than it first appears )
486
441
if (m :/: && -d $_ ) { push(@dirs , $_ ); next ; }
0 commit comments