Update to MakeMaker 5.34

1 files changed, 10 insertions, 9 deletions

diff --git a/lib/ExtUtils/Mksymlists.pm b/lib/ExtUtils/Mksymlists.pm
index 87b2b8fd22..5c0173a508 100644
--- a/lib/ExtUtils/Mksymlists.pm
+++ b/lib/ExtUtils/Mksymlists.pm
@@ -4,13 +4,14 @@ use strict qw[ subs refs ];
 
 use Carp;
 use Exporter;
-# mention vars twice to prevent single-use warnings
-@ExtUtils::Mksymlists::ISA = @ExtUtils::Mksymlists::ISA = 'Exporter';
-@ExtUtils::Mksymlists::EXPORT = @ExtUtils::Mksymlists::EXPORT = '&Mksymlists';
-$ExtUtils::Mksymlists::VERSION = $ExtUtils::Mksymlists::VERSION = '1.00';
+use vars qw( @ISA @EXPORT $VERSION );
+@ISA = 'Exporter';
+@EXPORT = '&Mksymlists';
+$VERSION = '1.03';
 
 sub Mksymlists {
     my(%spec) = @_;
+    my($osname) = $^O;
 
     croak("Insufficient information specified to Mksymlists")
         unless ( $spec{NAME} or
@@ -44,10 +45,10 @@ sub Mksymlists {
         $spec{DLBASE} = DynaLoader::mod2fname([ split(/::/,$spec{NAME}) ]);
     }
 
-    if    ($^O eq 'aix') { _write_aix(\%spec); }
-    elsif ($^O eq 'VMS') { _write_vms(\%spec) }
-    elsif ($^O eq 'os2') { _write_os2(\%spec) }
-    else { croak("Don't know how to create linker option file for $^O\n"); }
+    if    ($osname eq 'aix') { _write_aix(\%spec); }
+    elsif ($osname eq 'VMS') { _write_vms(\%spec) }
+    elsif ($osname =~ m|^os/?2$|i) { _write_os2(\%spec) }
+    else { croak("Don't know how to create linker option file for $osname\n"); }
 }
 
 
@@ -95,7 +96,7 @@ while (($name, $exp)= each %{$data->{IMPORTS}}) {
 sub _write_vms {
     my($data) = @_;
 
-    require Config;
+    require Config; # a reminder for once we do $^O
 
     my($isvax) = $Config::Config{'arch'} =~ /VAX/i;
     my($sym);