summaryrefslogtreecommitdiffstats
path: root/win/tcl.m4
diff options
context:
space:
mode:
authorhobbs <hobbs>2009-02-17 18:11:52 (GMT)
committerhobbs <hobbs>2009-02-17 18:11:52 (GMT)
commit025768e70f99fabd95951aeba08eacf06a075cf3 (patch)
tree62708f4306d12c0999fab4c9d4be3368bd723755 /win/tcl.m4
parent41463b5a0621de53847bd3048a0e2aa76477bc12 (diff)
downloadtk-025768e70f99fabd95951aeba08eacf06a075cf3.zip
tk-025768e70f99fabd95951aeba08eacf06a075cf3.tar.gz
tk-025768e70f99fabd95951aeba08eacf06a075cf3.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.m48
1 files changed, 6 insertions, 2 deletions
diff --git a/win/tcl.m4 b/win/tcl.m4
index 59b51c9..d2ed530 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -619,8 +619,12 @@ 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}d"
# Do not use -O2 for Win64 - this has proved buggy in code gen.