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

* Makefile.in: Tweak mingw libz.a detection to make it more reliably detect

Browse Source 
when libz.a is not available.
This commit is contained in:
Christopher Faylor 2003-09-12 01:51:21 +00:00
parent 9e24b8ace9
commit 3a25635489
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/utils/ChangeLog
View File

@ -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> 2003-09-11 Igor Pechtchanski <pechtcha@cs.nyu.edu>
* cygcheck.cc (dump_only): New global variable. * cygcheck.cc (dump_only): New global variable.

10
winsup/utils/Makefile.in
View File

@ -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} libintl:=${shell $(CC) -B$(bupdir2)/intl/ --print-file-name=libintl.a}
build_dumper:=${shell test -r $(libbfd) && test -r ${libintl} && echo 1} build_dumper:=${shell test -r $(libbfd) && test -r ${libintl} && echo 1}
libz:=${shell $(CC) -mno-cygwin --print-file-name=libz.a} 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/libz.a,%/include/zlib.h,$(libz)} zlib_h:=-include ${patsubst %/lib/mingw/libz.a,%/include/zlib.h,${patsubst %/lib/libz.a,%/include/zlib.h,$(libz)}}
zconf_h:=-include ${patsubst %/lib/libz.a,%/include/zconf.h,$(libz)} zconf_h:=${patsubst %/zlib.h,%/zconf.h,$(zlib_h)}
ifeq "${dir $(libz)}" "./" ifeq "${libz}" ""
zlib_h:= zlib_h:=
zconf_h:= zconf_h:=
libz:= libz:=
@ -101,7 +101,7 @@ endif
cygcheck.exe: cygcheck.o path.o dump_setup.o $(MINGW_DEP_LDLIBS) cygcheck.exe: cygcheck.o path.o dump_setup.o $(MINGW_DEP_LDLIBS)
ifeq "$(libz)" "" 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 endif
ifdef VERBOSE ifdef VERBOSE
$(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,3,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) $(libz) $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,3,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) $(libz)