From a7a790e9ec4f9abb149db11f6d765043c7aca245 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Tue, 24 Jan 2012 05:22:23 +0000 Subject: [PATCH] Makefile.am (libstdc++convenience.la): Correct stamp rule, copy. 2012-01-23 Benjamin Kosnik * src/Makefile.am (libstdc++convenience.la): Correct stamp rule, copy. * src/Makefile.in: Regenerate. From-SVN: r183465 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/src/Makefile.am | 6 +++--- libstdc++-v3/src/Makefile.in | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8af54d8cc4a..501c4dce219 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2012-01-23 Benjamin Kosnik + + * src/Makefile.am (libstdc++convenience.la): Correct stamp rule, copy. + * src/Makefile.in: Regenerate. + 2012-01-23 Benjamin Kosnik PR libstdc++/49829 diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index aa25a7e5ca8..87b2a1682d7 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -184,9 +184,9 @@ endif libstdc++convenience.la: $(toolexeclib_LTLIBRARIES) $(CXXLINK) $(libstdc___la_LIBADD) $(LIBS); \ if test ! -f .libs/libstdc++.a; then \ - $(LN_S) .libs/libstdc++convenience.a .libs/libstdc++.a; \ - stamp-libstdc++convenience; \ - fi; + cp .libs/libstdc++convenience.a .libs/libstdc++.a; \ + fi; \ + echo `date` > stamp-libstdc++convenience; debugdir = debug diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 92322c0e190..11ee8ba721e 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -798,9 +798,9 @@ vpath % $(top_srcdir) libstdc++convenience.la: $(toolexeclib_LTLIBRARIES) $(CXXLINK) $(libstdc___la_LIBADD) $(LIBS); \ if test ! -f .libs/libstdc++.a; then \ - $(LN_S) .libs/libstdc++convenience.a .libs/libstdc++.a; \ - stamp-libstdc++convenience; \ - fi; + cp .libs/libstdc++convenience.a .libs/libstdc++.a; \ + fi; \ + echo `date` > stamp-libstdc++convenience; # Build a set of debug objects here. # Take care to fix all possibly-relative paths.