* Makefile.in: Use a different method to invoke gcc in a cygwin-hosted

environment.
* mingwex/Makefile.in: Ditto.
* profile/Makefile.in: Ditto.
* configure.in: Record mingw front-end for building under Cygwin.
* mingwex/configure.in: Ditto.
* profile/configure.in: Ditto.
* configure: Regenerate.
* mingwex/configure: Ditto.
* profile/configure: Ditto.

winsup/mingw/ChangeLog

@@ -1,3 +1,16 @@
+2008-10-12  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* Makefile.in: Use a different method to invoke gcc in a cygwin-hosted
+	environment.
+	* mingwex/Makefile.in: Ditto.
+	* profile/Makefile.in: Ditto.
+	* configure.in: Record mingw front-end for building under Cygwin.
+	* mingwex/configure.in: Ditto.
+	* profile/configure.in: Ditto.
+	* configure: Regenerate.
+	* mingwex/configure: Ditto.
+	* profile/configure: Ditto.
+
 2008-10-11  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
 	Use de-facto standard Makefile goals to invoke test suite.

winsup/mingw/Makefile.in

@@ -104,11 +104,9 @@ CFLAGS = @CFLAGS@
 CXXFLAGS = @CXXFLAGS@
 
 # compiling with Cygwin?
-MNO_CYGWIN = @MNO_CYGWIN@
+NO_CYGWIN := @NO_CYGWIN@
-ifdef MNO_CYGWIN
+ifdef NO_CYGWIN
-   subdirforlib=/mingw
+override CC := ${NO_CYGWIN} $(firstword ${CC})
-else
-   libdir=
 endif
 
 # Either crtdll (CRT_ID 1) or msvcrt (CRT_ID 2).
@@ -128,8 +126,8 @@ INCLUDES = -I$(srcdir)/include \
   -I$(srcdir)/../include \
   -nostdinc \
   -iwithprefixbefore include
-ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE) $(MNO_CYGWIN)
+ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE)
-ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE) $(MNO_CYGWIN)
+ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE)
 
 AS = @AS@
 AR = @AR@

winsup/mingw/configure.in

@@ -51,14 +51,14 @@ W32API_INCLUDE='-I $(srcdir)/../w32api/include'
 
 case "$target_os" in
 *cygwin*)
-  MNO_CYGWIN=-mno-cygwin
+  NO_CYGWIN="$(cd ${srcdir}/../utils; pwd)/mingw"
   LIBM_A=libm.a
   # Install mingw headers in mingw subdirectory.
   HEADER_SUBDIR="mingw"
   ;;
 *)
   # Build it for MSVCRT by default.
-  MNO_CYGWIN=
+  NO_CYGWIN=
   LIBM_A=libm.a
   ;;
 esac
@@ -71,7 +71,7 @@ esac
 AC_SUBST([THREAD_DLL], [mingwm])
 
 AC_SUBST([MKINSTALLDIRS], [$ac_aux_dir/mkinstalldirs])
-AC_SUBST([MNO_CYGWIN])
+AC_SUBST([NO_CYGWIN])
 AC_SUBST([LIBM_A])
 AC_SUBST([LIBGMON_A])
 AC_SUBST([HEADER_SUBDIR])

winsup/mingw/mingwex/Makefile.in

@@ -106,14 +106,17 @@ WARNFLAGS = -Wall
 
 
 # compiling with Cygwin?
-MNO_CYGWIN = @MNO_CYGWIN@
+NO_CYGWIN := @NO_CYGWIN@
+ifdef NO_CYGWIN
+override CC := ${NO_CYGWIN} $(firstword $(filter-out ${NO_CYGWIN},${CC}))
+endif
 
 W32API_INCLUDE = @W32API_INCLUDE@
 INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../include \
   -nostdinc \
   -iwithprefixbefore include
-ALL_CFLAGS = $(CFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) $(W32API_INCLUDE) $(MNO_CYGWIN)
+ALL_CFLAGS = $(CFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) $(W32API_INCLUDE)
-ALL_CXXFLAGS = $(CXXFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE) $(MNO_CYGWIN)
+ALL_CXXFLAGS = $(CXXFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE)
 
 AS = @AS@
 AR = @AR@

winsup/mingw/mingwex/configure.in

@@ -37,15 +37,15 @@ AC_CANONICAL_SYSTEM
 
 case "$target_os" in
 *cygwin*)
-  MNO_CYGWIN=-mno-cygwin
+  NO_CYGWIN="$(cd ${srcdir}/../../utils; pwd)/mingw"
   ;;
 *)
   # Build it for MSVCRT by default.
-  MNO_CYGWIN=
+  NO_CYGWIN=
   ;;
 esac
 
-AC_SUBST(MNO_CYGWIN)
+AC_SUBST(NO_CYGWIN)
 
 W32API_INCLUDE='-I $(srcdir)/../../w32api/include'
 AC_SUBST(W32API_INCLUDE)

winsup/mingw/profile/Makefile.in

@@ -36,7 +36,10 @@ CFLAGS = @CFLAGS@
 CXXFLAGS = @CXXFLAGS@
 
 # compiling with Cygwin?
-MNO_CYGWIN = @MNO_CYGWIN@
+NO_CYGWIN := @NO_CYGWIN@
+ifdef NO_CYGWIN
+override CC := ${NO_CYGWIN} $(firstword $(filter-out ${NO_CYGWIN},${CC}))
+endif
 
 # Either crtdll (CRT_ID 1) or msvcrt (CRT_ID 2).
 RUNTIME = @RUNTIME@
@@ -51,8 +54,8 @@ W32API_INCLUDE = @W32API_INCLUDE@
 INCLUDES = -I$(srcdir) -I$(srcdir)/../include \
   -nostdinc \
   -iwithprefixbefore include
-ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE) $(MNO_CYGWIN)
+ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE)
-ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE) $(MNO_CYGWIN)
+ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE)
 
 AS = @AS@
 AR = @AR@

winsup/mingw/profile/configure.in

@@ -40,13 +40,13 @@ LIBGMON_A=libgmon.a
 case "$target_os" in
 *mingw32crt*)
   CRT_ID=1
-  MNO_CYGWIN=
+  NO_CYGWIN=
   RUNTIME=crtdll
   CRT0S="gcrt1.o gcrt2.o"
   ;;
 *cygwin*)
   CRT_ID=2
-  MNO_CYGWIN=-mno-cygwin
+  NO_CYGWIN="$(cd ${srcdir}/../../utils; pwd)/mingw"
   RUNTIME=msvcrt
   CRT0S=gcrt0.o
   # Do not build libm.a when building under Cygwin winsup. Otherwise, it'll
@@ -55,7 +55,7 @@ case "$target_os" in
 *)
   # Build it for MSVCRT by default.
   CRT_ID=2
-  MNO_CYGWIN=
+  NO_CYGWIN=
   RUNTIME=msvcrt
   CRT0S="gcrt1.o gcrt2.o"
   ;;
@@ -65,7 +65,7 @@ W32API_INCLUDE='-I $(srcdir)/../../w32api/include'
 
 AC_SUBST(CRT_ID)
 AC_SUBST(RUNTIME)
-AC_SUBST(MNO_CYGWIN)
+AC_SUBST(NO_CYGWIN)
 AC_SUBST(LIBGMON_A)
 AC_SUBST(CRT0S)
 AC_SUBST(W32API_INCLUDE)