diff options
| -rw-r--r-- | winsup/utils/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/utils/Makefile.in | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index acb4a73b6..b15c4174d 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,7 @@ +2012-11-27 Christopher Faylor <me.cygwin2012@cgf.cx> + + * Makefile.in: Make sure that libz is always loaded staticly. + 2012-11-26 Christopher Faylor <me.cygwin2012@cgf.cx> * configure.ac: Rename from configure.in. diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in index c73957778..0a60052ab 100644 --- a/winsup/utils/Makefile.in +++ b/winsup/utils/Makefile.in @@ -85,7 +85,7 @@ mount.exe: path-mount.o # Provide any necessary per-target variable overrides. -cygcheck.exe: MINGW_LDFLAGS += -lpsapi -lntdll -lz +cygcheck.exe: MINGW_LDFLAGS += -lpsapi -lntdll --static -lz cygcheck.exe: ${CYGCHECK_OBJS} cygpath.o: CXXFLAGS += -fno-threadsafe-statics @@ -107,7 +107,7 @@ CYGWIN_BINS += dumper.exe dumper.o module_info.o parse_pe.o: CXXFLAGS += -I$(top_srcdir)/include dumper.o parse_pe.o: dumper.h dumper.exe: module_info.o parse_pe.o -dumper.exe: CYGWIN_LDFLAGS += -lbfd -lintl -liconv -liberty -lz +dumper.exe: CYGWIN_LDFLAGS += -lbfd -lintl -liconv -liberty --static -lz else all: warn_dumper endif |