diff options
| author | Christopher Faylor <me@cgf.cx> | 2004-02-21 04:51:15 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2004-02-21 04:51:15 +0000 |
| commit | 7c03f79971ed1e8ab3ad8818747444b60ed8cd38 (patch) | |
| tree | 01a3302b4b3af940a5739a40c488f57ed4613e4a /winsup/utils/Makefile.in | |
| parent | 3a0f12b5885fa877c3365ef0ff114346f21ce92c (diff) | |
| download | cygnal-7c03f79971ed1e8ab3ad8818747444b60ed8cd38.tar.gz cygnal-7c03f79971ed1e8ab3ad8818747444b60ed8cd38.tar.bz2 cygnal-7c03f79971ed1e8ab3ad8818747444b60ed8cd38.zip | |
* Makefile.in (build_dumper): Detect missing iconv library.
* cygpath.cc (dowin): Report on filename conversion errors.
(doit): Ditto.
* strace.cc (main): Use symbolic constant for _STRACE_ALL when setting mask.
Diffstat (limited to 'winsup/utils/Makefile.in')
| -rw-r--r-- | winsup/utils/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in index 3a5291104..e6069891f 100644 --- a/winsup/utils/Makefile.in +++ b/winsup/utils/Makefile.in @@ -36,9 +36,10 @@ override CXXFLAGS+=-fno-exceptions -fno-rtti -DHAVE_DECL_GETOPT=0 include $(srcdir)/../Makefile.common +LIBICONV:=@libiconv@ 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} +build_dumper:=${shell test -r $(libbfd) -a -r $(libintl) -a -n "$(LIBICONV)" && echo 1} 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)}} @@ -63,7 +64,6 @@ ALL_LDLIBS:=${patsubst $(w32api_lib)/lib%.a,-l%,\ ${filter-out $(libkernel32),\ ${filter-out $(libcygwin), $(ALL_DEP_LDLIBS)}}}} -LIBICONV:=@libiconv@ MINGW_LIB:=$(mingw_build)/libmingw32.a DUMPER_LIB:=${libbfd} ${libintl} -L$(bupdir1)/libiberty $(LIBICONV) -liberty MINGW_LDLIBS:=${filter-out $(libcygwin),$(ALL_LDLIBS) $(MINGW_LIB)} |