diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2013-02-21 02:13:17 +0000 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2013-02-21 02:13:17 +0000 |
| commit | 7e38f161ead94f1b1f88c9e931368002757e166f (patch) | |
| tree | 786598798c7293aee2e2e3e987fc9776aa4f0514 | |
| parent | aa102a6a578981d05c60d7a3f037312133da40ee (diff) | |
| download | cygnal-7e38f161ead94f1b1f88c9e931368002757e166f.tar.gz cygnal-7e38f161ead94f1b1f88c9e931368002757e166f.tar.bz2 cygnal-7e38f161ead94f1b1f88c9e931368002757e166f.zip | |
* Makefile.in (CYGWIN_LDFLAGS): Replace -static-lib* with -static.
(MINGW_LDFLAGS): Ditto.
(ZLIB): Simplify accordingly.
| -rw-r--r-- | winsup/utils/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/utils/Makefile.in | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 3d8420b38..9eaa7dc0b 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,9 @@ +2013-02-20 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> + + * Makefile.in (CYGWIN_LDFLAGS): Replace -static-lib* with -static. + (MINGW_LDFLAGS): Ditto. + (ZLIB): Simplify accordingly. + 2012-12-14 Corinna Vinschen <corinna@vinschen.de> * utils.sgml (mount): Document sparse mount option. diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in index 0a352d4d0..93894e821 100644 --- a/winsup/utils/Makefile.in +++ b/winsup/utils/Makefile.in @@ -49,7 +49,7 @@ EXEEXT_FOR_BUILD:=@EXEEXT_FOR_BUILD@ .PHONY: all install clean realclean warn_dumper warn_cygcheck_zlib LDLIBS := -lnetapi32 -ladvapi32 -lkernel32 -luser32 -CYGWIN_LDFLAGS := -static-libgcc -static-libstdc++ -Wl,--enable-auto-import -L${WINDOWS_LIBDIR} $(LDLIBS) +CYGWIN_LDFLAGS := -static -Wl,--enable-auto-import -L${WINDOWS_LIBDIR} $(LDLIBS) DEP_LDLIBS := $(cygwin_build)/libcygwin.a MINGW_CXX := @MINGW_CXX@ @@ -67,10 +67,10 @@ MINGW_BINS := ${addsuffix .exe,cygcheck cygwin-console-helper ldh strace} # list will will be compiled in Cygwin mode implicitly, so there is no # need for a CYGWIN_OBJS. MINGW_OBJS := bloda.o cygcheck.o dump_setup.o ldh.o path.o strace.o -MINGW_LDFLAGS:=-L${WINDOWS_LIBDIR} -static-libgcc -static-libstdc++ +MINGW_LDFLAGS:=-L${WINDOWS_LIBDIR} -static CYGCHECK_OBJS:=cygcheck.o bloda.o path.o dump_setup.o -ZLIB:=-Wl,-dn,-lz,-dy +ZLIB:=-lz .PHONY: all all: |