diff options
| author | Steve Hay <SteveHay@planit.com> | 2005-06-16 08:51:14 +0000 |
|---|---|---|
| committer | Steve Hay <SteveHay@planit.com> | 2005-06-16 08:51:14 +0000 |
| commit | b1b56c2bff2b127ae1b2b5a15edebcfe33038f4d (patch) | |
| tree | 271d164782f122f8dcf0e9e477cb129b4acfde39 /win32 | |
| parent | 7f7445c1b6990c946436a82df42eb96650ac3283 (diff) | |
| download | perl-b1b56c2bff2b127ae1b2b5a15edebcfe33038f4d.tar.gz | |
Enable static extensions with Borland compiler on Win32
p4raw-id: //depot/perl@24862
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/buildext.pl | 2 | ||||
| -rw-r--r-- | win32/makefile.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/win32/buildext.pl b/win32/buildext.pl index 90518d1e4f..2f18b9070d 100644 --- 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 02ccd1fd7e..417d480120 100644 --- 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" |