Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/newlib-cygwin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2013-05-21 13:32:12 +0400
committerCorinna Vinschen <corinna@vinschen.de>2013-05-21 13:32:12 +0400
commit649619b56d2452bcb88fecee67aee2d08dce00e8 (patch)
treef8d85d5d8fa38e5d77c0cc6b3302535375269227 /winsup/utils
parent99e87649c7c5840ad9f1304b2ceb06a02fd40b3a (diff)
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.
Diffstat (limited to 'winsup/utils')
-rw-r--r--winsup/utils/ChangeLog8
-rw-r--r--winsup/utils/Makefile.in4
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