From 4df557d94ae27e4ad49b3017942dc68c5c3e0157 Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Sat, 2 Feb 2008 14:14:49 +0000 Subject: 2008-02-01 Brian Dessent * Makefile.in: Add rules to generate multiple versions of libmoldname.a for the different runtime versions. --- winsup/mingw/ChangeLog | 5 +++++ winsup/mingw/Makefile.in | 14 +++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 9c1de4347..67d775a1d 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,8 @@ +2008-02-01 Brian Dessent + + * Makefile.in: Add rules to generate multiple versions of libmoldname.a for + the different runtime versions. + 2007-12-27 Chris Sutcliffe * include/_mingw.h: Increment version to 3.14. diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in index 51c3336d5..e92e6c681 100644 --- a/winsup/mingw/Makefile.in +++ b/winsup/mingw/Makefile.in @@ -1,5 +1,5 @@ # Makefile.in for the winsup/mingw directory. -# Copyright (c) 1995, 1996, 1997, 1998 Cygnus Solutions +# Copyright (c) 1995-2008, 1996, 1997, 1998 Cygnus Solutions # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -188,6 +188,10 @@ LIBS = libcrtdll.a \ libmingw32.a \ libcoldname.a \ libmoldname.a libmoldnamed.a \ + libmoldname70.a libmoldname70d.a \ + libmoldname71.a libmoldname71d.a \ + libmoldname80.a libmoldname80d.a \ + libmoldname90.a libmoldname90d.a \ $(LIBM_A) \ libmingwthrd.a @@ -301,17 +305,17 @@ libcoldname.a: moldname-crtdll.def $(MOLD_OBJS) $(AR) rc $@ $(MOLD_OBJS) $(RANLIB) $@ -libmoldname.a: moldname-msvcrt.def $(MOLD_OBJS) +libmoldname.a libmoldnamed.a: moldname-msvcrt.def $(MOLD_OBJS) $(DLLTOOL) --as $(AS) -k -U \ - --dllname msvcrt.dll \ + --dllname msvcrt$(@:libmoldname%a=%)dll \ --def moldname-msvcrt.def \ --output-lib $@ $(AR) rc $@ $(MOLD_OBJS) $(RANLIB) $@ -libmoldnamed.a: moldname-msvcrt.def $(MOLD_OBJS) +libmoldname70.a libmoldname70d.a libmoldname71.a libmoldname71d.a libmoldname80.a libmoldname80d.a libmoldname90.a libmoldname90d.a: moldname-msvcrt.def $(MOLD_OBJS) $(DLLTOOL) --as $(AS) -k -U \ - --dllname msvcrtd.dll \ + --dllname msvcr$(@:libmoldname%a=%)dll \ --def moldname-msvcrt.def \ --output-lib $@ $(AR) rc $@ $(MOLD_OBJS) -- cgit v1.2.3