summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2003-02-20 10:12:15 +0000
committerCorinna Vinschen <corinna@vinschen.de>2003-02-20 10:12:15 +0000
commit3f3d479490d6b84dd23f7d150a1520e596698e54 (patch)
tree14916fffdfd9f16bae7047408fd6319c7729a144
parentd089d59a8577a8fd9678bd53102d93979b1fc844 (diff)
downloadcygnal-3f3d479490d6b84dd23f7d150a1520e596698e54.tar.gz
cygnal-3f3d479490d6b84dd23f7d150a1520e596698e54.tar.bz2
cygnal-3f3d479490d6b84dd23f7d150a1520e596698e54.zip
* Makefile.in: Make sure libmingwex.a from current build tree is used.
-rw-r--r--winsup/mingw/ChangeLog4
-rw-r--r--winsup/mingw/Makefile.in5
2 files changed, 7 insertions, 2 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 7273efe5d..0841a7c4a 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-20 Corinna Vinschen <corinna@vinschen.de>
+
+ * Makefile.in: Make sure libmingwex.a from current build tree is used.
+
2003-02-14 Christopher Faylor <cgf@redhat.com>
* profile/Makefile.in (mcount.o): Use ALL_CFLAGS for compilation to
diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in
index 4e57d0cea..b3709540b 100644
--- a/winsup/mingw/Makefile.in
+++ b/winsup/mingw/Makefile.in
@@ -208,12 +208,13 @@ xx_$(THREAD_DLL_NAME) xx_mingwthrd.def: mthr.o mthr_init.o
DLL_OFILES = mthr.o mthr_init.o
DLL_CC_STUFF = -B./ -mdll $(MNO_CYGWIN) -Wl,--image-base,0x6FBC0000 \
-Wl,--entry,_DllMainCRTStartup@12 \
- $(DLL_OFILES)
+ $(DLL_OFILES) \
+ -Lmingwex
DLL_DLLTOOL_STUFF = --as=$(AS) --dllname $(THREAD_DLL_NAME) \
--def mingwthrd.def \
--base-file mingwthrd.base --output-exp mingwthrd.exp
-$(THREAD_DLL_NAME) mingwthrd.def: $(DLL_OFILES) Makefile
+$(THREAD_DLL_NAME) mingwthrd.def: $(DLL_OFILES) Makefile $(SUBDIRS)
$(DLLTOOL) --as $(AS) --output-def mingwthrd.def $(DLL_OFILES)
$(CC) -Wl,--base-file=mingwthrd.base $(DLL_CC_STUFF) \
-o mingwthrd_dummy.exe