summaryrefslogtreecommitdiffstats
path: root/win/configure
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2013-09-26 16:32:21 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2013-09-26 16:32:21 (GMT)
commitac2d8a32cbf79c952b06116a786c2466322ad368 (patch)
tree00a289e9d95d3bc7852194ae11167c5bc96f414a /win/configure
parente3309e4d57407994dfba25053019cd7f1f5bd083 (diff)
parent38f8605a8d202951bbf792a4813b9b48a20910fb (diff)
downloadtcl-ac2d8a32cbf79c952b06116a786c2466322ad368.zip
tcl-ac2d8a32cbf79c952b06116a786c2466322ad368.tar.gz
tcl-ac2d8a32cbf79c952b06116a786c2466322ad368.tar.bz2
merge trunk
Diffstat (limited to 'win/configure')
-rwxr-xr-xwin/configure6
1 files changed, 3 insertions, 3 deletions
diff --git a/win/configure b/win/configure
index e7c1329..be9c98a 100755
--- a/win/configure
+++ b/win/configure
@@ -3449,6 +3449,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
@@ -3577,6 +3579,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
@@ -3599,9 +3602,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