* Makefile.in: Filter newlib includes from mingw compilation.

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 1cad7d9..bbd59e4 100644 (file)
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 19 12:22:08 2001  Christopher Faylor <cgf@cygnus.com>
+
+       * Makefile.in: Filter newlib includes from mingw compilation.
+
 2001-09-14  Egor Duda  <deo@logos-m.ru>
 
        * dumper.cc (dumper::dumper): Print error code in case of error.

diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in
index 12e1cbd..979c7d7 100644 (file)
--- a/winsup/utils/Makefile.in
+++ b/winsup/utils/Makefile.in
@@ -35,7 +35,7 @@ CXXFLAGS:=@CXXFLAGS@ -fno-exceptions -fno-rtti
 
 include $(srcdir)/../Makefile.common
 
-MINGW_INCLUDES:=-I$(mingw_source)/include -I$(cygwin_source)/include -I$(w32api_include)
+MINGW_INCLUDES:=-I$(mingw_source)/include -I$(w32api_include)
 
 libbfd:=${shell $(CC) -L$(bupdir2)/bfd --print-file-name=libbfd.a}
 libintl:=${shell $(CC) -L$(bupdir2)/intl --print-file-name=libintl.a}
@@ -43,7 +43,7 @@ build_dumper:=${shell test -r $(libbfd) && test -r ${libintl} &&  echo 1}
 
 DUMPER_INCLUDES:=-I$(bupdir2)/bfd -I$(updir1)/include
 
-MINGW_CXXFLAGS:=$(CXXFLAGS) -mno-cygwin $(MINGW_INCLUDES)
+MINGW_CXXFLAGS:=${filter-out $(newlib_source)/%,$(CXXFLAGS)} -mno-cygwin $(MINGW_INCLUDES)
 MINGW_CFLAGS:=-mno-cygwin $(MINGW_INCLUDES)
 
 libcygwin:=$(cygwin_build)/libcygwin.a
@@ -125,7 +125,7 @@ ifdef VERBOSE
        $(COMPILE_CC) $c -o $(@D)/$(basename $@)$o $(MINGW_CFLAGS) $<
 else
        @echo $(CC) $c -o $(@D)/$(basename $@)$o $(MINGW_CFLAGS) ... $^;\
-       $(COMPILE_CC) $c -o $(@D)/$(basename $@)$o $(MINGW_CFLAGS) $<
+       ${filter-out -I$(newlib_source)/%,$(COMPILE_CC)} $c -o $(@D)/$(basename $@)$o $(MINGW_CFLAGS) $<
 endif
 
 clean: