aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kosnik <bkoz@redhat.com>2012-01-24 05:22:23 +0000
committerBenjamin Kosnik <bkoz@gcc.gnu.org>2012-01-24 05:22:23 +0000
commita7a790e9ec4f9abb149db11f6d765043c7aca245 (patch)
tree26a3b2925224e25d807aefefed825f6a53b35681
parente5e45c6878371a2d5734800688c93af8c2e6c9ac (diff)
downloadgcc-a7a790e9ec4f9abb149db11f6d765043c7aca245.zip
gcc-a7a790e9ec4f9abb149db11f6d765043c7aca245.tar.gz
gcc-a7a790e9ec4f9abb149db11f6d765043c7aca245.tar.bz2
Makefile.am (libstdc++convenience.la): Correct stamp rule, copy.
2012-01-23 Benjamin Kosnik <bkoz@redhat.com> * src/Makefile.am (libstdc++convenience.la): Correct stamp rule, copy. * src/Makefile.in: Regenerate. From-SVN: r183465
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/src/Makefile.am6
-rw-r--r--libstdc++-v3/src/Makefile.in6
3 files changed, 11 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8af54d8..501c4dc 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
2012-01-23 Benjamin Kosnik <bkoz@redhat.com>
+ * src/Makefile.am (libstdc++convenience.la): Correct stamp rule, copy.
+ * src/Makefile.in: Regenerate.
+
+2012-01-23 Benjamin Kosnik <bkoz@redhat.com>
+
PR libstdc++/49829
Add libc++98convenience.la, libc++11convenience.la.
* src/c++98: New directory.
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index aa25a7e..87b2a16 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 92322c0..11ee8ba 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.