diff options
| -rw-r--r-- | winsup/utils/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/utils/Makefile.in | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index ea7fb223b..b293b1e3c 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,10 @@ +2009-05-16 Corinna Vinschen <corinna@vinschen.de> + + * 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. + 2009-05-15 Corinna Vinschen <corinna@vinschen.de> * cygpath.cc (main): Only setlocale for LC_CTYPE category. Fallback diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in index 103942778..f80bcca33 100644 --- a/winsup/utils/Makefile.in +++ b/winsup/utils/Makefile.in @@ -71,8 +71,8 @@ cygcheck.exe: bloda.o path.o dump_setup.o # Provide any necessary per-target variable overrides. cygcheck.exe: MINGW_LDFLAGS += -lntdll -cygpath.exe: ALL_LDFLAGS += -lntdll -ps.exe: ALL_LDFLAGS += -lntdll +cygpath.exe: ALL_LDFLAGS += -lcygwin -lntdll +ps.exe: ALL_LDFLAGS += -lcygwin -lntdll ldd.exe: ALL_LDFLAGS += -lpsapi |