Index: cygwin
===================================================================
RCS file: /cactusdevcvs/Cactus/lib/make/known-architectures/cygwin,v
retrieving revision 1.31
diff -b -B -u -r1.31 cygwin
--- cygwin	20 May 2004 16:29:48 -0000	1.31
+++ cygwin	22 Jan 2007 22:11:31 -0000
@@ -43,8 +43,8 @@
     CYGWIN_CC_COMP=microsoft
   elif test "`$CC 2>&1 | grep -i intel`" ; then 
     CYGWIN_CC_COMP=intel
-#  elif test "`$CC 2>&1 | grep -i gcc`" ; then
-#    CYGWIN_CC_COMP=gnu
+  elif test "`$CC 2>&1 | grep -i gcc`" ; then
+    CYGWIN_CC_COMP=gnu
   else
     echo Unknown Windows C compiler.
     echo Please add appropriate information to 
@@ -60,8 +60,8 @@
     CYGWIN_CXX_COMP=microsoft
   elif test "`$CXX 2>&1 | grep -i intel`" ; then 
     CYGWIN_CXX_COMP=intel
-#  elif test "`$CXX 2>&1 | grep -i gcc`" ; then
-#    CYGWIN_CXX_COMP=gnu
+  elif test "`$CXX 2>&1 | grep -i g++`" ; then
+    CYGWIN_CXX_COMP=gnu
   else
     echo Unknown Windows C++ compiler.
     echo Please add appropriate information to 
@@ -161,17 +161,27 @@
 
   TRANSFORM_DIRS='$(shell cygpath -wa $(1))'
 
+  case "$CYGWIN_CC_COMP" in
+      gnu)
+      : ${C_DEPEND='$(CPP) -x c++ -E -MM -D_WIN32 $(CPPFLAGS) '}
+      : ${CXX_DEPEND='$(CPP) -x c++ -E -MM -D_WIN32 $(CPPFLAGS) '}
+
+      : {C_DEPEND_OUT='-D_M_IX86 > $@'}
+      : {CXX_DEPEND_OUT='-D_M_IX86 > $@'}
+      ;;
+      *)
 # The -nostdinc stops it picking stdio.h, etc, from the GNU headers.
 # The -x c++ is because some of the Windows headers contain C++ comments
-  C_DEPEND='$(CPP) -x c++ -E -MM -nostdinc -D_WIN32 $(CPPFLAGS) '
-  CXX_DEPEND='$(CPP) -x c++ -E -MM -nostdinc -D_WIN32 $(CPPFLAGS) '
+      : ${C_DEPEND='$(CPP) -x c++ -E -MM -nostdinc -D_WIN32 $(CPPFLAGS) '}
+      : ${CXX_DEPEND='$(CPP) -x c++ -E -MM -nostdinc -D_WIN32 $(CPPFLAGS) '}
 
 # Add in system include dirs from $(INCLUDE).  These may contain spaces.
 # The -D_M_IX86 is necessary for things like winnt.h.  Since this is
 # only used for generating dependencies, it shouldn't make a difference
 # if we use this same flag on ia64.
-  C_DEPEND_OUT='-D_M_IX86 -I"$(strip $(subst ;," -I",$(INCLUDE)))" > $@'
-  CXX_DEPEND_OUT='-D_M_IX86 -I"$(strip $(subst ;," -I",$(INCLUDE)))" > $@'
+      : {C_DEPEND_OUT='-D_M_IX86 -I"$(strip $(subst ;," -I",$(INCLUDE)))" > $@'}
+      : {CXX_DEPEND_OUT='-D_M_IX86 -I"$(strip $(subst ;," -I",$(INCLUDE)))" > $@'}
+  esac
 
   MKDIR="mkdir "
   MKDIRFLAGS=" -p "