RM600-svr4 tweaks (from Frank Ridderbusch

<frank.ridderbusch@pdb.siemens.de>)

p4raw-id: //depot/perl@5878

diff --git a/ext/POSIX/Makefile.PL b/ext/POSIX/Makefile.PL
index 15256cf..55c5c1f 100644 (file)
--- a/ext/POSIX/Makefile.PL
+++ b/ext/POSIX/Makefile.PL
@@ -1,7 +1,17 @@
 use ExtUtils::MakeMaker;
+use Config;
+my @libs;
+if ($^O ne 'MSWin32') {
+    if ($Config{archname} =~ /RM\d\d\d-svr4/) {
+       @libs = ('LIBS' => ["-lm -lc -lposix -lcposix"]);
+    }
+    else {
+       @libs = ('LIBS' => ["-lm -lposix -lcposix"]);
+    }
+}
 WriteMakefile(
     NAME       => 'POSIX',
-    ($^O eq 'MSWin32' ? () : (LIBS => ["-lm -lposix -lcposix"])),
+    @libs,
     MAN3PODS   => {},  # Pods will be built by installman.
     XSPROTOARG => '-noprototypes',             # XXX remove later?
     VERSION_FROM => 'POSIX.pm', 

diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm
index 47ce3dc..6029557 100644 (file)
--- a/lib/ExtUtils/Liblist.pm
+++ b/lib/ExtUtils/Liblist.pm
@@ -109,6 +109,7 @@ sub _unix_os2_ext {
            } elsif (-f ($fullname="$thispth/lib$thislib.$so")
                 && (($Config{'dlsrc'} ne "dl_dld.xs") || ($thislib eq "m"))){
            } elsif (-f ($fullname="$thispth/lib${thislib}_s$Config_libext")
+                 && (! $Config{'archname'} =~ /RM\d\d\d-svr4/)
                 && ($thislib .= "_s") ){ # we must explicitly use _s version
            } elsif (-f ($fullname="$thispth/lib$thislib$Config_libext")){
            } elsif (-f ($fullname="$thispth/$thislib$Config_libext")){