[PATCH] Add libz to dumper.exe link [was Re: Re: speclib vs. -lc trouble.]

Christopher Faylor cgf-use-the-mailinglist-please@cygwin.com
Mon Apr 13 16:59:00 GMT 2009


On Mon, Apr 13, 2009 at 05:11:10PM +0100, Dave Korn wrote:
>  Ok?
>
>winsup/utils/ChangeLog
>
>	* Makefile.in (libz):  New makefile variable.
>	(build_dumper):  Test it was correctly set.
>	(dumper.exe):  Use it.
>
>Index: winsup/utils/Makefile.in
>===================================================================
>RCS file: /cvs/src/src/winsup/utils/Makefile.in,v
>retrieving revision 1.82
>diff -p -u -r1.82 Makefile.in
>--- winsup/utils/Makefile.in	18 Mar 2009 04:19:05 -0000	1.82
>+++ winsup/utils/Makefile.in	13 Apr 2009 15:07:21 -0000
>@@ -81,14 +81,16 @@ ldh.exe: MINGW_LDFLAGS := -nostdlib -lke
> # Check for dumper's requirements and enable it if found.
> LIBICONV := @libiconv@
> libbfd   := ${shell $(CC) -B$(bupdir2)/bfd/ --print-file-name=libbfd.a}
>+# Recent libbfd requires libz as it handles compressed files.
>+libz     := ${shell $(CC) -B$(bupdir2)/zlib/ --print-file-name=libz.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}
>+build_dumper := ${shell test -r $(libbfd) -a -r $(libz) -a -r $(libintl) -a -n "$(LIBICONV)" && echo 1}
> ifdef build_dumper
> CYGWIN_BINS += dumper.exe
> dumper.o module_info.o parse_pe.o: CXXFLAGS += -I$(bupdir2)/bfd -I$(updir1)/include
> dumper.o parse_pe.o: dumper.h
> dumper.exe: module_info.o parse_pe.o
>-dumper.exe: ALL_LDFLAGS += ${libbfd} ${libintl} -L$(bupdir1)/libiberty $(LIBICONV) -liberty
>+dumper.exe: ALL_LDFLAGS += ${libbfd} ${libintl} ${libz} -L$(bupdir1)/libiberty $(LIBICONV) -liberty
> else
> all: warn_dumper
> endif

I think you can get by with just adding -lz to the ALL_LDFLAGS line and
removing the other stuff.  The tests for libintl and libbfd are supposed
to just detect if the appropriate directories are available.  There
isn't likely going to be a libz two levels above cygwin's source
directory so I don't see any reason to specfically check for it.

cgf



More information about the Cygwin-patches mailing list