Enable static extensions with Borland compiler on Win32

p4raw-id: //depot/perl@24862

diff --git a/win32/buildext.pl b/win32/buildext.pl
index 90518d1..2f18b90 100644 (file)
--- a/win32/buildext.pl
+++ b/win32/buildext.pl
@@ -61,7 +61,7 @@ if ($opts{'list-static-libs'} || $opts{'create-perllibst-h'}) {
       open my $fh, "<..\\lib\\auto\\$_\\extralibs.ld" or die "can't open <..\\lib\\auto\\$_\\extralibs.ld: $!";
       $extralibs{$_}++ for grep {/\S/} split /\s+/, join '', <$fh>;
     }
-    print map {/([^\/]+)$/;"..\\lib\\auto\\$_/$1$Config{_a} "} @statics;
+    print map {s|/|\\|g;m|([^\\]+)$|;"..\\lib\\auto\\$_\\$1$Config{_a} "} @statics;
     print map {"$_ "} sort keys %extralibs;
   }
   exit;

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 02ccd1f..417d480 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1088,7 +1088,7 @@ $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static
        $(LINK32) -Tpd -ap $(BLINK_FLAGS) \
            @$(mktmp c0d32$(o) $(PERLDLL_OBJ:s,\,$B,)$N \
                $@,$N \
-               $(LIBFILES)$N \
+               $(shell @type Extensions_static) $(LIBFILES)$N \
                perldll.def$N)
        $(IMPLIB) $*.lib $@
 .ELIF "$(CCTYPE)" == "GCC"