From: Gurusamy Sarathy <gsar@cpan.org>
Date: Tue, 14 Mar 2000 07:43:37 +0000 (+0000)
Subject: fixes for Borland compiler (from Vadim Konovalov
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5268c7a4ffaff09425867b98837ac473369d8333;p=p5sagit%2Fp5-mst-13.2.git

fixes for Borland compiler (from Vadim Konovalov
<vkonovalov@lucent.com>)

p4raw-id: //depot/perl@5726
---

diff --git a/utils/perlcc.PL b/utils/perlcc.PL
index 971923b..f0636f6 100644
--- a/utils/perlcc.PL
+++ b/utils/perlcc.PL
@@ -390,10 +390,16 @@ sub _ccharness
     @$libs = grep { !(/DynaLoader\.a$/ && ($dynaloader = $_)) } @$libs
 	if($^O eq 'cygwin');
 
+    my $args = "@args";
+    if ($^O eq 'MSWin32' && $Config{cc} =~ /^bcc/i) {
+        # BC++ cmd line syntax does not allow space between -[oexz...] and arg
+        $args =~ s/(^|\s+)-([oe])\s+/$1-$2/g;
+    }
+
     my $ccflags = $Config{ccflags};
     $ccflags .= ' -DUSEIMPORTLIB' if $^O eq 'cygwin';
     my $cccmd = "$Config{cc} $ccflags $optimize $incdir "
-		."@args $dynaloader $linkargs @$libs";
+		."$args $dynaloader $linkargs @$libs";
 
     _print ("$cccmd\n", 36);
     _run("$cccmd", 18 );
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 3d4f57e..f2a19da 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -838,9 +838,9 @@ CFG_VARS	=					\
 		d_crypt=$(D_CRYPT)		~	\
 		d_mymalloc=$(PERL_MALLOC)	~	\
 		libs=$(LIBFILES:f)		~	\
-		incpath=$(CCINCDIR)		~	\
+		incpath=$(CCINCDIR:s/\/\\/)	~	\
 		libperl=$(PERLIMPLIB:f)		~	\
-		libpth=$(CCLIBDIR);$(EXTRALIBDIRS)		~	\
+		libpth=$(CCLIBDIR:s/\/\\/);$(EXTRALIBDIRS:s/\/\\/)	~	\
 		libc=$(LIBC)			~	\
 		make=dmake			~	\
 		_o=$(o)	obj_ext=$(o)		~	\