JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Makefile.in: Check for header file existence when building dumper.exe too.

Browse Source
This commit is contained in:
Christopher Faylor
2011-08-21 19:36:52 +00:00
parent 059f809e4b
commit 8f8977bb8b
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/utils/ChangeLog
View File

@@ -1,3 +1,8 @@
2011-08-21 Christopher Faylor <me.cygwin2011@cgf.cx>
* Makefile.in: Check for header file existence when building dumper.exe
too.
2011-08-10 Corinna Vinschen <corinna@vinschen.de> 2011-08-10 Corinna Vinschen <corinna@vinschen.de>
* ps.cc (main): Don't overwrite process name, just attach <defunct> * ps.cc (main): Don't overwrite process name, just attach <defunct>

8
winsup/utils/Makefile.in
View File

@@ -88,7 +88,8 @@ ldh.exe: MINGW_LDFLAGS := -nostdlib -lkernel32
LIBICONV := @libiconv@ LIBICONV := @libiconv@
libbfd := ${shell $(CC) -B$(bupdir2)/bfd/ --print-file-name=libbfd.a} libbfd := ${shell $(CC) -B$(bupdir2)/bfd/ --print-file-name=libbfd.a}
libintl := ${shell $(CC) -B$(bupdir2)/intl/ --print-file-name=libintl.a} libintl := ${shell $(CC) -B$(bupdir2)/intl/ --print-file-name=libintl.a}
build_dumper := ${shell test -r $(libbfd) -a -r $(libintl) -a -n "$(LIBICONV)" && echo 1} bfdlink := $(shell ${CC} -xc /dev/null -o /dev/null -c -B${bupdir2}/bfd/ -include bfd.h 2>&1)
build_dumper := ${shell test -r $(libbfd) -a -r $(libintl) -a -n "$(LIBICONV)" -a -z "${bfdlink}" && echo 1}
ifdef build_dumper ifdef build_dumper
CYGWIN_BINS += dumper.exe CYGWIN_BINS += dumper.exe
dumper.o module_info.o parse_pe.o: CXXFLAGS += -I$(bupdir2)/bfd -I$(updir1)/include dumper.o module_info.o parse_pe.o: CXXFLAGS += -I$(bupdir2)/bfd -I$(updir1)/include
@@ -180,8 +181,9 @@ $(MINGW_LIB): $(mingw_build)/Makefile
@$(MAKE) -C $(@D) $(@F) @$(MAKE) -C $(@D) $(@F)
warn_dumper: warn_dumper:
@echo '*** Not building dumper.exe since some required libraries are' @echo '*** Not building dumper.exe since some required libraries or'
@echo '*** missing: libbfd.a and libintl.a.' @echo '*** or headers are missing. Potential candidates are:'
@echo '*** bfd.h, libbfd.a, libiconv.a, or libintl.a'
@echo '*** If you need this program, check out the naked-bfd and naked-intl' @echo '*** If you need this program, check out the naked-bfd and naked-intl'
@echo '*** sources from sourceware.org. Then, configure and build these' @echo '*** sources from sourceware.org. Then, configure and build these'
@echo '*** libraries. Otherwise, you can safely ignore this warning.' @echo '*** libraries. Otherwise, you can safely ignore this warning.'