[ID 20001207.009] Not OK: perl v5.7.0 +DEVEL8030 on os2-64int-ld 2.30

Message-Id: <200012080532.eB85Wh729109@garcia.efn.org>

p4raw-id: //depot/perl@8040

diff --git a/Changes b/Changes
index 575e09f..255071c 100644 (file)
--- a/Changes
+++ b/Changes
@@ -269,7 +269,7 @@ ____________________________________________________________________________
              Date: Mon, 04 Dec 2000 22:21:59 -0800
              Message-ID: <HmIL6gzkgepS092yn@efn.org>
              
-             Harness shouldn't ignore responses like "ok 3\r\n\n".
+             Harness shouldn't ignore responses like "ok 3\r\r\n".
      Branch: perl
           ! lib/Test/Harness.pm
 ____________________________________________________________________________

diff --git a/lib/ExtUtils/MM_OS2.pm b/lib/ExtUtils/MM_OS2.pm
index 501832b..c0c5240 100644 (file)
--- a/lib/ExtUtils/MM_OS2.pm
+++ b/lib/ExtUtils/MM_OS2.pm
@@ -38,7 +38,7 @@ $self->{BASEEXT}.def: Makefile.PL
      ', "DL_VARS" => ', neatvalue($vars), ');\'
 ');
     }
-    if (%{$self->{IMPORTS}}) {
+    if ($self->{IMPORTS} && %{$self->{IMPORTS}}) {
        # Make import files (needed for static build)
        -d 'tmp_imp' or mkdir 'tmp_imp', 0777 or die "Can't mkdir tmp_imp";
        open IMP, '>tmpimp.imp' or die "Can't open tmpimp.imp";
@@ -61,7 +61,7 @@ $self->{BASEEXT}.def: Makefile.PL
 sub static_lib {
     my($self) = @_;
     my $old = $self->ExtUtils::MM_Unix::static_lib();
-    return $old unless %{$self->{IMPORTS}};
+    return $old unless $self->{IMPORTS} && %{$self->{IMPORTS}};
     
     my @chunks = split /\n{2,}/, $old;
     shift @chunks unless length $chunks[0]; # Empty lines at the start