summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-09-23 12:54:37 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-09-23 12:54:37 (GMT)
commitfda5a92486b6dbcc21fa7a92de8cde9615f315a8 (patch)
tree919f715054283df3feecea7843fb17bdda9f3926
parenta8971e87514c789bdbdae34285478713a00a6e19 (diff)
parentcd619dfd1b22f4313a03f048399fa4981ae43f83 (diff)
downloadtk-fda5a92486b6dbcc21fa7a92de8cde9615f315a8.zip
tk-fda5a92486b6dbcc21fa7a92de8cde9615f315a8.tar.gz
tk-fda5a92486b6dbcc21fa7a92de8cde9615f315a8.tar.bz2
workaround for mingw bug [http://comments.gmane.org/gmane.comp.gnu.mingw.user/41724]
-rwxr-xr-xwin/configure6
-rw-r--r--win/tcl.m46
2 files changed, 6 insertions, 6 deletions
diff --git a/win/configure b/win/configure
index 807e1ae..92ebdfb 100755
--- a/win/configure
+++ b/win/configure
@@ -3598,6 +3598,8 @@ echo "${ECHO_T}yes" >&6
# set various compiler flags depending on whether we are using gcc or cl
if test "${GCC}" = "yes" ; then
+ extra_cflags="-pipe"
+ extra_ldflags="-pipe"
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
@@ -3726,6 +3728,7 @@ 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
@@ -3748,9 +3751,6 @@ echo $ECHO_N "checking compiler flags... $ECHO_C" >&6
MAKE_EXE="\${CC} -o \$@"
LIBPREFIX="lib"
- extra_cflags="$extra_cflags -pipe"
- extra_ldflags="$extra_ldflags -pipe"
-
if test "${SHARED_BUILD}" = "0" ; then
# static
echo "$as_me:$LINENO: result: using static flags" >&5
diff --git a/win/tcl.m4 b/win/tcl.m4
index 7a1aa02..335494b 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -633,6 +633,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
# set various compiler flags depending on whether we are using gcc or cl
if test "${GCC}" = "yes" ; then
+ extra_cflags="-pipe"
+ extra_ldflags="-pipe"
AC_CACHE_CHECK(for mingw32 version of gcc,
ac_cv_win32,
AC_TRY_COMPILE([
@@ -663,6 +665,7 @@ 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
@@ -684,9 +687,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
MAKE_EXE="\${CC} -o \[$]@"
LIBPREFIX="lib"
- extra_cflags="$extra_cflags -pipe"
- extra_ldflags="$extra_ldflags -pipe"
-
if test "${SHARED_BUILD}" = "0" ; then
# static
AC_MSG_RESULT([using static flags])