From f9be533f9eff9a8a9c57868795f99a279e7f5b84 Mon Sep 17 00:00:00 2001 From: glx Date: Sun, 19 May 2013 15:44:09 +0000 Subject: [PATCH] (svn r25266) -Fix: gcc4.6 removed -mno-cygwin option --- config.lib | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/config.lib b/config.lib index aeb480aa3a..d13bb04aec 100644 --- a/config.lib +++ b/config.lib @@ -1487,12 +1487,15 @@ make_cflags_and_ldflags() { LDFLAGS="$LDFLAGS -mwin32" fi if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then - flags="$flags -mno-cygwin" + if [ $cc_version -lt 46 ]; then + flags="$flags -mno-cygwin" + LDFLAGS="$LDFLAGS -mno-cygwin" + fi if [ "$enable_console" != "0" ]; then - LDFLAGS="$LDFLAGS -mno-cygwin -Wl,--subsystem,console" + LDFLAGS="$LDFLAGS -Wl,--subsystem,console" else - LDFLAGS="$LDFLAGS -mno-cygwin -Wl,--subsystem,windows" + LDFLAGS="$LDFLAGS -Wl,--subsystem,windows" fi LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32"