diff options
| -rw-r--r-- | winsup/utils/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/utils/Makefile.in | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 764285fc6..e67bb102a 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,11 @@ +2013-05-21 Corinna Vinschen <corinna@vinschen.de> + + Reinstantiate accidentally removed patch from 2009-05-16: + * Makefile.in (cygpath.exe): Link against cygwin.a before linking + against ntdll.dll to avoid linking symbols defined in both DLLs + from ntdll. + (ps.exe): Ditto. + 2013-05-10 Warren Young <warren@etr-usa.com> * utils.sgml utils.xml: Renamed utils.sgml to utils.xml, added diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in index 93894e821..e42d748ce 100644 --- a/winsup/utils/Makefile.in +++ b/winsup/utils/Makefile.in @@ -90,8 +90,8 @@ cygcheck.exe: MINGW_LDFLAGS += ${ZLIB} -lpsapi -lntdll cygcheck.exe: ${CYGCHECK_OBJS} cygpath.o: CXXFLAGS += -fno-threadsafe-statics -cygpath.exe: CYGWIN_LDFLAGS += -luserenv -lntdll -ps.exe: CYGWIN_LDFLAGS += -lpsapi -lntdll +cygpath.exe: CYGWIN_LDFLAGS += -lcygwin -luserenv -lntdll +ps.exe: CYGWIN_LDFLAGS += -lcygwin -lpsapi -lntdll strace.exe: MINGW_LDFLAGS += -lntdll ldd.exe:CYGWIN_LDFLAGS += -lpsapi |