summaryrefslogtreecommitdiffstats
path: root/win/tcl.m4
diff options
context:
space:
mode:
authorhobbs <hobbs>2009-02-17 18:10:37 (GMT)
committerhobbs <hobbs>2009-02-17 18:10:37 (GMT)
commit17a25327f7cbb0069baa3dbfa9cc989dc39541a3 (patch)
tree0ee8be5929048a8eaf87c0293711226405d02644 /win/tcl.m4
parentf48011341a542c319bbdae8fa307edc8d5c4efa2 (diff)
downloadtcl-17a25327f7cbb0069baa3dbfa9cc989dc39541a3.zip
tcl-17a25327f7cbb0069baa3dbfa9cc989dc39541a3.tar.gz
tcl-17a25327f7cbb0069baa3dbfa9cc989dc39541a3.tar.bz2
* win/tcl.m4, win/configure: Check if cl groks _WIN64 already to
avoid CC manipulation that can screw up later configure checks. Use 'd'ebug runtime in 64-bit builds.
Diffstat (limited to 'win/tcl.m4')
-rw-r--r--win/tcl.m410
1 files changed, 7 insertions, 3 deletions
diff --git a/win/tcl.m4 b/win/tcl.m4
index 1a46527..4b55dc4 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -619,10 +619,14 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
# The space-based-path will work for the Makefile, but will
# not work if AC_TRY_COMPILE is called. TEA has the
# TEA_PATH_NOSPACE to avoid this issue.
- CC="\"${PATH64}/cl.exe\" -I\"${MSSDK}/Include\" \
- -I\"${MSSDK}/Include/crt\" -I\"${MSSDK}/Include/crt/sys\""
+ # Check if _WIN64 is already recognized, and if so we don't
+ # need to modify CC.
+ AC_CHECK_DECL([_WIN64], [],
+ [CC="\"${PATH64}/cl.exe\" -I\"${MSSDK}/Include\" \
+ -I\"${MSSDK}/Include/crt\" \
+ -I\"${MSSDK}/Include/crt/sys\""])
RC="\"${MSSDK}/bin/rc.exe\""
- CFLAGS_DEBUG="-nologo -Zi -Od ${runtime}"
+ CFLAGS_DEBUG="-nologo -Zi -Od ${runtime}d"
# Do not use -O2 for Win64 - this has proved buggy in code gen.
CFLAGS_OPTIMIZE="-nologo -O1 ${runtime}"
lflags="-nologo -MACHINE:${MACHINE} -LIBPATH:\"${MSSDK}/Lib/${MACHINE}\""