diff options
| author | hobbs <hobbs> | 2009-02-17 18:06:56 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2009-02-17 18:06:56 (GMT) |
| commit | 9c046a5217080e9316c026a2df53062bbb0e76bc (patch) | |
| tree | bb293bad7dd65a559ffe33fe14b9e52977f3ad56 /win/tcl.m4 | |
| parent | 9d3c4057d313047c7da3fa8d9624b06913b814d1 (diff) | |
| download | tcl-9c046a5217080e9316c026a2df53062bbb0e76bc.zip tcl-9c046a5217080e9316c026a2df53062bbb0e76bc.tar.gz tcl-9c046a5217080e9316c026a2df53062bbb0e76bc.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.m4 | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -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}\"" |