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

This commit is contained in:
Christopher Faylor 2001-09-19 16:22:47 +00:00
parent 09376842d4
commit de6305a0e4
2 changed files with 7 additions and 3 deletions

View File

@ -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> 2001-09-14 Egor Duda <deo@logos-m.ru>
* dumper.cc (dumper::dumper): Print error code in case of error. * dumper.cc (dumper::dumper): Print error code in case of error.

View File

@ -35,7 +35,7 @@ CXXFLAGS:=@CXXFLAGS@ -fno-exceptions -fno-rtti
include $(srcdir)/../Makefile.common 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} libbfd:=${shell $(CC) -L$(bupdir2)/bfd --print-file-name=libbfd.a}
libintl:=${shell $(CC) -L$(bupdir2)/intl --print-file-name=libintl.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 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) MINGW_CFLAGS:=-mno-cygwin $(MINGW_INCLUDES)
libcygwin:=$(cygwin_build)/libcygwin.a libcygwin:=$(cygwin_build)/libcygwin.a
@ -125,7 +125,7 @@ ifdef VERBOSE
$(COMPILE_CC) $c -o $(@D)/$(basename $@)$o $(MINGW_CFLAGS) $< $(COMPILE_CC) $c -o $(@D)/$(basename $@)$o $(MINGW_CFLAGS) $<
else else
@echo $(CC) $c -o $(@D)/$(basename $@)$o $(MINGW_CFLAGS) ... $^;\ @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 endif
clean: clean: