From: Vadim Konovalov <vkonovalov@lucent.com>
Date: Tue, 14 Nov 2000 09:31:13 +0000 (+0300)
Subject: some additions for makefiles for win32 (for perl@7674)
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=fd826df20626be7c608e33b1edcdc11e7174f60a;p=p5sagit%2Fp5-mst-13.2.git

some additions for makefiles for win32 (for perl@7674)
From: "Konovalov, Vadim" <vkonovalov@lucent.com>
Message-ID: <402099F49BEED211999700805FC7359F8254FC@ru0028exch01.spb.lucent.com>

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

diff --git a/win32/Makefile b/win32/Makefile
index 94b0175..fafbd27 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -707,6 +707,7 @@ CFG_VARS	=					\
 		"INST_ARCH=$(INST_ARCH)"		\
 		"archname=$(ARCHNAME)"			\
 		"cc=$(CC)"				\
+		"ld=$(LINK32)"				\
 		"ccflags=-nologo -Gf -W3 $(OPTIMIZE:"=\") $(DEFINES) $(BUILDOPT)"	\
 		"cf_email=$(EMAIL)"	 		\
 		"d_crypt=$(D_CRYPT)"			\
diff --git a/win32/config.bc b/win32/config.bc
index f6ee0c3..0bd59dd 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -40,7 +40,7 @@ byteorder='1234'
 c=''
 castflags='0'
 cat='type'
-cc='bcc32'
+cc='~CC~'
 cccdlflags=' '
 ccdlflags='-tWD'
 ccflags='-DWIN32'
@@ -532,7 +532,7 @@ ivsize='4'
 ivtype='long'
 known_extensions='~static_ext~ ~dynamic_ext~ ~nonxs_ext~'
 ksh=''
-ld='tlink32'
+ld='~LINK32~'
 lddlflags='-Tpd ~LINK_FLAGS~'
 ldflags='~LINK_FLAGS~'
 ldlibpthname=''
diff --git a/win32/config.gc b/win32/config.gc
index ecaeb4b..4cdfd15 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -40,7 +40,7 @@ byteorder='1234'
 c=''
 castflags='0'
 cat='type'
-cc='gcc'
+cc='~CC~'
 cccdlflags=' '
 ccdlflags=' '
 ccflags='-MD -DWIN32'
diff --git a/win32/config.vc b/win32/config.vc
index bb57962..d8843fd 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -40,7 +40,7 @@ byteorder='1234'
 c=''
 castflags='0'
 cat='type'
-cc='cl'
+cc='~CC~'
 cccdlflags=' '
 ccdlflags=' '
 ccflags='-MD -DWIN32'
@@ -532,7 +532,7 @@ ivsize='4'
 ivtype='long'
 known_extensions='~static_ext~ ~dynamic_ext~ ~nonxs_ext~'
 ksh=''
-ld='link'
+ld='~LINK32~'
 lddlflags='-dll ~LINK_FLAGS~'
 ldflags='~LINK_FLAGS~'
 ldlibpthname=''
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 86a2bf4..d9b666a 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -813,6 +813,7 @@ CFG_VARS	=					\
 		INST_ARCH=$(INST_ARCH)		~	\
 		archname=$(ARCHNAME)		~	\
 		cc=$(CC)			~	\
+		ld=$(LINK32)			~	\
 		ccflags=$(OPTIMIZE) $(DEFINES) $(BUILDOPT)	~	\
 		cf_email=$(EMAIL)		~	\
 		d_crypt=$(D_CRYPT)		~	\