diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-09-27 09:42:27 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-09-27 09:42:27 (GMT) |
| commit | ce39c47aa3d8e5767729511d3ab853cf1fe9af41 (patch) | |
| tree | 5177a21ecd97055a7a74ec7ea16b527ad6270aa1 | |
| parent | c23066514482f0e8e2b176b7e4d1703f31c66afb (diff) | |
| download | tk-ce39c47aa3d8e5767729511d3ab853cf1fe9af41.zip tk-ce39c47aa3d8e5767729511d3ab853cf1fe9af41.tar.gz tk-ce39c47aa3d8e5767729511d3ab853cf1fe9af41.tar.bz2 | |
Workaround for [http://sourceforge.net/p/mingw/bugs/2065/|MinGW bug #2065].
Both MinGW and MinGW-w64 (32-bit) are affected.
Even though Win64 is not affected, adding -static-libgcc doesn't harm there, and we don't want to distrubute additional dll's with MinGW-compiled Tcl anyway.
| -rwxr-xr-x | win/configure | 3 | ||||
| -rw-r--r-- | win/tcl.m4 | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/win/configure b/win/configure index 92ebdfb..14b35ab 100755 --- a/win/configure +++ b/win/configure @@ -3599,7 +3599,7 @@ echo "${ECHO_T}yes" >&6 if test "${GCC}" = "yes" ; then extra_cflags="-pipe" - extra_ldflags="-pipe" + extra_ldflags="-pipe -static-libgcc" echo "$as_me:$LINENO: checking for mingw32 version of gcc" >&5 echo $ECHO_N "checking for mingw32 version of gcc... $ECHO_C" >&6 if test "${ac_cv_win32+set}" = set; then @@ -3728,7 +3728,6 @@ echo "${ECHO_T}$ac_cv_municode" >&6 extra_ldflags="$extra_ldflags -municode" else extra_cflags="$extra_cflags -DTCL_BROKEN_MAINARGS" - extra_ldflags="$extra_ldflags -static-libgcc" fi fi @@ -634,7 +634,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ if test "${GCC}" = "yes" ; then extra_cflags="-pipe" - extra_ldflags="-pipe" + extra_ldflags="-pipe -static-libgcc" AC_CACHE_CHECK(for mingw32 version of gcc, ac_cv_win32, AC_TRY_COMPILE([ @@ -665,7 +665,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ extra_ldflags="$extra_ldflags -municode" else extra_cflags="$extra_cflags -DTCL_BROKEN_MAINARGS" - extra_ldflags="$extra_ldflags -static-libgcc" fi fi |