Last patch needed to get Perl5.7 to build natively on VOS

   Message-Id: <95AE3CDB3543D511883A0020485B38B90235349B@exna3.stratus.com>

p4raw-id: //depot/perl@14124

5 files changed, 20 insertions, 7 deletions

diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
index eafbd67ec8..201a8f3a6b 100644
--- a/ext/Errno/Errno_pm.PL
+++ b/ext/Errno/Errno_pm.PL
@@ -123,6 +123,9 @@ sub get_files {
 	# hidden in a special place
 	$file{'/boot/develop/headers/posix/errno.h'} = 1;
 
+    } elsif ($^O eq 'vos') {
+	# avoid problem where cpp returns non-POSIX pathnames
+	$file{'/system/include_library/errno.h'} = 1;
     } else {
 	open(CPPI,"> errno.c") or
 	    die "Cannot open errno.c";
diff --git a/perl.h b/perl.h
index 466d7c1f0e..7a876b59c4 100644
--- a/perl.h
+++ b/perl.h
@@ -1789,7 +1789,11 @@ typedef struct clone_params CLONE_PARAMS;
 #endif
 
 #if defined(__VOS__)
-#   include "./vos/vosish.h"
+#   ifdef __GNUC__
+#     include "./vos/vosish.h"
+#   else
+#     include "vos/vosish.h"
+#   endif
 #   define ISHISH "vos"
 #endif
 
diff --git a/t/TEST b/t/TEST
index 54ed3efee6..34f15bf9e5 100755
--- a/t/TEST
+++ b/t/TEST
@@ -30,7 +30,7 @@ if ($#ARGV >= 0) {
 chdir 't' if -f 't/TEST';
 
 die "You need to run \"make test\" first to set things up.\n"
-  unless -e 'perl' or -e 'perl.exe';
+  unless -e 'perl' or -e 'perl.exe' or -e 'perl.pm';
 
 if ($ENV{PERL_3LOG}) { # Tru64 third(1) tool, see perlhack
     unless (-x 'perl.third') {
diff --git a/t/test.pl b/t/test.pl
index 4fdbd6fcf3..14d5334e05 100644
--- a/t/test.pl
+++ b/t/test.pl
@@ -368,11 +368,13 @@ sub which_perl {
 		$Perl = File::Spec->catfile(File::Spec->curdir(), $perl);
 	    }
 	}
-	
-        # Its like this.  stat on Cygwin treats 'perl' to mean 'perl.exe'
-        # but open does not.  This can get confusing, so to be safe we
-        # always put the .exe on the end on Cygwin.
-        $Perl .= $exe if $^O eq 'cygwin' && $Perl !~ /\Q$exe\E$/;
+
+	# Build up the name of the executable file from the name of
+	# the command.
+
+	if ($Perl !~ /\Q$exe\E$/i) {
+	    $Perl .= $exe;
+	}
 
 	warn "which_perl: cannot find $Perl from $^X" unless -f $Perl;
 	
diff --git a/vos/vosish.h b/vos/vosish.h
index 838bcdf7df..cc5e4642e3 100644
--- a/vos/vosish.h
+++ b/vos/vosish.h
@@ -1,4 +1,8 @@
+#ifdef __GNUC__
 #include "../unixish.h"
+#else
+#include "unixish.h"
+#endif
 
 /* The following declaration is an avoidance for posix-950. */
 extern int ioctl (int fd, int request, ...);