diff options
| author | mdejong <mdejong> | 2005-12-10 01:36:46 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2005-12-10 01:36:46 (GMT) |
| commit | 7a60e0f3a116c26ff850ce104cb3249f04049920 (patch) | |
| tree | accee04a2b4b0555cacedab2a8e9352712447a47 /win | |
| parent | 4fdc73733207bd69ff17bc8c150e026e35accb5b (diff) | |
| download | tcl-7a60e0f3a116c26ff850ce104cb3249f04049920.zip tcl-7a60e0f3a116c26ff850ce104cb3249f04049920.tar.gz tcl-7a60e0f3a116c26ff850ce104cb3249f04049920.tar.bz2 | |
* win/configure: Regen.
* win/tcl.m4 (SC_CONFIG_CFLAGS): Define MACHINE
for gcc builds. The lack of a definition of this
variable in the manifest file was causing a
runtime error in wish built with gcc.
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 3 | ||||
| -rw-r--r-- | win/tcl.m4 | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/win/configure b/win/configure index 2391b54..eeb01c5 100755 --- a/win/configure +++ b/win/configure @@ -3417,6 +3417,9 @@ echo "$as_me: error: ${CC} does not support the -shared option. #LDFLAGS_WINDOW="-mwindows -e _WinMain@16 ${extra_ldflags}" LDFLAGS_CONSOLE="-mconsole ${extra_ldflags}" LDFLAGS_WINDOW="-mwindows ${extra_ldflags}" + + # gcc under Windows supports only 32bit builds + MACHINE="X86" else if test "${SHARED_BUILD}" = "0" ; then # static @@ -552,6 +552,9 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ #LDFLAGS_WINDOW="-mwindows -e _WinMain@16 ${extra_ldflags}" LDFLAGS_CONSOLE="-mconsole ${extra_ldflags}" LDFLAGS_WINDOW="-mwindows ${extra_ldflags}" + + # gcc under Windows supports only 32bit builds + MACHINE="X86" else if test "${SHARED_BUILD}" = "0" ; then # static |