Fix win32/config.*'s cc, ld and other related values

cc and ld themselves always get replaced with correct values anyway
       so we just provide example values as per other similar settings

       Other related values (ccname, cpp, cpprun, cppstdin) need to use the
       correct ~keyword~, namely ~cc~, not ~CC~, otherwise they do not get set

Subject: [PATCH] Re: lib/Config/Extensions.t fails on Win32
Date: Wed, 5 Jan 2005 10:01:41 -0800
Message-ID: <20050105180141.GA676@efn.org>

Subject: Re: [PATCH] Re: lib/Config/Extensions.t fails on Win32
From: Yitzchak Scott-Thoennes <sthoenna@efn.org>
Date: Thu, 6 Jan 2005 11:53:11 -0800
Message-ID: <20050106195311.GC1300@efn.org>

p4raw-id: //depot/perl@23764

diff --git a/win32/config.bc b/win32/config.bc
index 7433a99..c920a41 100644 (file)
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -41,12 +41,12 @@ byteorder='1234'
 c=''
 castflags='0'
 cat='type'
-cc='~CC~'
+cc='bcc32'
 cccdlflags=' '
 ccdlflags='-tWD'
 ccflags='-DWIN32'
 ccflags_uselargefiles=''
-ccname='~CC~'
+ccname='~cc~'
 ccsymbols=''
 ccversion=''
 cf_by='nobody'
@@ -673,7 +673,7 @@ ivsize='4'
 ivtype='long'
 known_extensions='~static_ext~ ~dynamic_ext~ ~nonxs_ext~'
 ksh=''
-ld='~LINK32~'
+ld='tlink32'
 lddlflags='-Tpd ~LINK_FLAGS~'
 ldflags='~LINK_FLAGS~'
 ldflags_uselargefiles=''

diff --git a/win32/config.gc b/win32/config.gc
index 665954d..925eab2 100644 (file)
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -41,12 +41,12 @@ byteorder='1234'
 c=''
 castflags='0'
 cat='type'
-cc='~CC~'
+cc='gcc'
 cccdlflags=' '
 ccdlflags=' '
 ccflags='-MD -DWIN32'
 ccflags_uselargefiles=''
-ccname='~CC~'
+ccname='~cc~'
 ccsymbols=''
 ccversion=''
 cf_by='nobody'
@@ -62,14 +62,14 @@ compress=''
 contains='grep'
 cp='copy'
 cpio=''
-cpp='gcc -E'
+cpp='~cc~ -E'
 cpp_stuff='42'
 cppccsymbols=''
 cppflags='-DWIN32'
 cpplast=''
 cppminus='-'
-cpprun='gcc -E'
-cppstdin='gcc -E'
+cpprun='~cc~ -E'
+cppstdin='~cc~ -E'
 cppsymbols=''
 crypt_r_proto='0'
 cryptlib=''
@@ -672,7 +672,7 @@ ivsize='4'
 ivtype='long'
 known_extensions='~static_ext~ ~dynamic_ext~ ~nonxs_ext~'
 ksh=''
-ld='gcc'
+ld='g++'
 lddlflags='-mdll ~LINK_FLAGS~'
 ldflags='~LINK_FLAGS~'
 ldflags_uselargefiles=''

diff --git a/win32/config.vc b/win32/config.vc
index 6d72842..3c97a0b 100644 (file)
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -41,12 +41,12 @@ byteorder='1234'
 c=''
 castflags='0'
 cat='type'
-cc='~CC~'
+cc='cl'
 cccdlflags=' '
 ccdlflags=' '
 ccflags='-MD -DWIN32'
 ccflags_uselargefiles=''
-ccname='~CC~'
+ccname='~cc~'
 ccsymbols=''
 ccversion=''
 cf_by='nobody'
@@ -62,13 +62,13 @@ compress=''
 contains='grep'
 cp='copy'
 cpio=''
-cpp='cl -nologo -E'
+cpp='~cc~ -nologo -E'
 cpp_stuff='42'
 cppccsymbols=''
 cppflags='-DWIN32'
 cpplast=''
 cppminus=''
-cpprun='cl -nologo -E'
+cpprun='~cc~ -nologo -E'
 cppstdin='cppstdin'
 cppsymbols=''
 crypt_r_proto='0'
@@ -672,7 +672,7 @@ ivsize='4'
 ivtype='long'
 known_extensions='~static_ext~ ~dynamic_ext~ ~nonxs_ext~'
 ksh=''
-ld='~LINK32~'
+ld='link'
 lddlflags='-dll ~LINK_FLAGS~'
 ldflags='~LINK_FLAGS~'
 ldflags_uselargefiles=''

diff --git a/win32/config.vc64 b/win32/config.vc64
index 8d1820d..3994642 100644 (file)
--- a/win32/config.vc64
+++ b/win32/config.vc64
@@ -41,12 +41,12 @@ byteorder='1234'
 c=''
 castflags='0'
 cat='type'
-cc='~CC~'
+cc='cl'
 cccdlflags=' '
 ccdlflags=' '
 ccflags='-MD -DWIN32'
 ccflags_uselargefiles=''
-ccname='~CC~'
+ccname='~cc~'
 ccsymbols=''
 ccversion=''
 cf_by='nobody'
@@ -62,13 +62,13 @@ compress=''
 contains='grep'
 cp='copy'
 cpio=''
-cpp='cl -nologo -E'
+cpp='~cc~ -nologo -E'
 cpp_stuff='42'
 cppccsymbols=''
 cppflags='-DWIN32'
 cpplast=''
 cppminus=''
-cpprun='cl -nologo -E'
+cpprun='~cc~ -nologo -E'
 cppstdin='cppstdin'
 cppsymbols=''
 crypt_r_proto='0'
@@ -672,7 +672,7 @@ ivsize='8'
 ivtype='__int64'
 known_extensions='~static_ext~ ~dynamic_ext~ ~nonxs_ext~'
 ksh=''
-ld='~LINK32~'
+ld='link'
 lddlflags='-dll ~LINK_FLAGS~'
 ldflags='~LINK_FLAGS~'
 ldflags_uselargefiles=''