X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FSDBM_File%2FMakefile.PL;h=1267efc859e6cf8ade78e02dd4691933cf1da9a1;hb=46471bde41ad0777edf7b89818df6730e8b55c20;hp=132bdadf2641e85cae021eb1aa4974a3b3fb3a59;hpb=00b027972d07e1d53ec42ba7bbc007b558fb67f0;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/SDBM_File/Makefile.PL b/ext/SDBM_File/Makefile.PL
index 132bdad..1267efc 100644
--- a/ext/SDBM_File/Makefile.PL
+++ b/ext/SDBM_File/Makefile.PL
@@ -6,8 +6,12 @@ use Config;
 #	config, all, clean, realclean and sdbm/Makefile
 # which perform the corresponding actions in the subdirectory.
 
+# Work around: Darwin ppc64 bug ignores archive contents when building bundles
+
 $define = ($^O eq 'MSWin32') ? '-DMSDOS' : '';
 if ($^O eq 'MSWin32') { $myextlib = 'sdbm\\libsdbm$(LIB_EXT)'; }
+elsif ($^O eq 'darwin' && $Config{'ldflags'} =~/-arch ppc64/) {
+                        $myextlib = '-all_load sdbm/libsdbm$(LIB_EXT)'; }
 else                  { $myextlib = 'sdbm/libsdbm$(LIB_EXT)';  }
 
 WriteMakefile(
@@ -21,10 +25,10 @@ WriteMakefile(
              );
 
 sub MY::postamble {
-  if ($^O =~ /MSWin32/ && Win32::IsWin95()) {
+  if ($^O =~ /MSWin32/ && !defined($ENV{SYSTEMROOT})) {
 	if ($Config{'make'} =~ /dmake/i) {
 	    # dmake-specific
-	    return <<EOT;
+	    return <<'EOT';
 $(MYEXTLIB): sdbm/Makefile
 @[
 	cd sdbm
@@ -34,7 +38,7 @@ $(MYEXTLIB): sdbm/Makefile
 EOT
 	} elsif ($Config{'make'} =~ /nmake/i) {
 	    #
-	    return <<EOT;
+	    return <<'EOT';
 $(MYEXTLIB): sdbm/Makefile
 	cd sdbm
 	$(MAKE) all