diff options
| author | Christopher Faylor <me@cgf.cx> | 2003-09-12 01:51:21 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2003-09-12 01:51:21 +0000 |
| commit | 3a256354895af562cd86392c8d8c502ac4e73dc0 (patch) | |
| tree | c4ed7903216b1291365d7c912f98ef39333f4630 | |
| parent | 9e24b8ace9ef4865df9e1f2f23313be45abeca21 (diff) | |
| download | cygnal-3a256354895af562cd86392c8d8c502ac4e73dc0.tar.gz cygnal-3a256354895af562cd86392c8d8c502ac4e73dc0.tar.bz2 cygnal-3a256354895af562cd86392c8d8c502ac4e73dc0.zip | |
* Makefile.in: Tweak mingw libz.a detection to make it more reliably detect
when libz.a is not available.
| -rw-r--r-- | winsup/utils/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/utils/Makefile.in | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index d4a935fe8..e6b79649b 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,8 @@ +2003-09-11 Christopher Faylor <cgf@redhat.com> + + * Makefile.in: Tweak mingw libz.a detection to make it more reliably + detect when libz.a is not available. + 2003-09-11 Igor Pechtchanski <pechtcha@cs.nyu.edu> * cygcheck.cc (dump_only): New global variable. diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in index a9765c115..74a38e6d8 100644 --- a/winsup/utils/Makefile.in +++ b/winsup/utils/Makefile.in @@ -40,10 +40,10 @@ libbfd:=${shell $(CC) -B$(bupdir2)/bfd/ --print-file-name=libbfd.a} libintl:=${shell $(CC) -B$(bupdir2)/intl/ --print-file-name=libintl.a} build_dumper:=${shell test -r $(libbfd) && test -r ${libintl} && echo 1} -libz:=${shell $(CC) -mno-cygwin --print-file-name=libz.a} -zlib_h:=-include ${patsubst %/lib/libz.a,%/include/zlib.h,$(libz)} -zconf_h:=-include ${patsubst %/lib/libz.a,%/include/zconf.h,$(libz)} -ifeq "${dir $(libz)}" "./" +libz:=${shell x=$$($(CC) -mno-cygwin --print-file-name=libz.a); cd $$(dirname $$x); dir=$$(pwd); case "$$dir" in *mingw*) echo $$dir/libz.a ;; esac} +zlib_h:=-include ${patsubst %/lib/mingw/libz.a,%/include/zlib.h,${patsubst %/lib/libz.a,%/include/zlib.h,$(libz)}} +zconf_h:=${patsubst %/zlib.h,%/zconf.h,$(zlib_h)} +ifeq "${libz}" "" zlib_h:= zconf_h:= libz:= @@ -101,7 +101,7 @@ endif cygcheck.exe: cygcheck.o path.o dump_setup.o $(MINGW_DEP_LDLIBS) ifeq "$(libz)" "" - echo '*** Building cygcheck without package content checking due to missing mingw libz.a.' + @echo '*** Building cygcheck without package content checking due to missing mingw libz.a.' endif ifdef VERBOSE $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,3,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) $(libz) |