diff options
| author | Nicholas Clark <nick@ccl4.org> | 2008-10-18 21:20:19 +0000 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2008-10-18 21:20:19 +0000 |
| commit | 444c2e40cd0ea36b829c3148c73f26229f0ec7aa (patch) | |
| tree | a8022be58cb1059e402d1c70f2caec8fba6f40ba | |
| parent | dbcf044e3834b3dc858e34fbff84d5b2d1eaeb9f (diff) | |
| download | perl-444c2e40cd0ea36b829c3148c73f26229f0ec7aa.tar.gz | |
Suggestion from Slaven - reverse the part of 23348 that removed the
conditional call to dl_expandspec() on platforms that default
$do_expand to false. autorequire, rightly or wrongly, is relying on
being able to set $do_expand to true.
p4raw-id: //depot/perl@34513
| -rw-r--r-- | ext/DynaLoader/DynaLoader_pm.PL | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ext/DynaLoader/DynaLoader_pm.PL b/ext/DynaLoader/DynaLoader_pm.PL index 91fa048e11..2b833e5749 100644 --- a/ext/DynaLoader/DynaLoader_pm.PL +++ b/ext/DynaLoader/DynaLoader_pm.PL @@ -336,9 +336,7 @@ sub bootstrap { # check for common cases to avoid autoload of dl_findfile my $try = <<$^O-eq-MacOS>> "$dir:$modfname.$dl_dlext" <<|$^O-eq-MacOS>> "$dir/$modfname.$dl_dlext"<</$^O-eq-MacOS>>; - last if $file = <<$^O-eq-VMS>>($do_expand) ? dl_expandspec($try) : ((-f $try) && $try); - <<|$^O-eq-VMS>>(-f $try) && $try; - <</$^O-eq-VMS>> + last if $file = ($do_expand) ? dl_expandspec($try) : ((-f $try) && $try); # no luck here, save dir for possible later dl_findfile search push @dirs, $dir; |