diff options
author | Jakub Jelinek <jakub@redhat.com> | 2012-01-26 11:55:12 +0100 |
---|---|---|
committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2012-01-26 11:55:12 +0100 |
commit | 4bca22f3c2569b1aeb40ffedd03240836881c9bf (patch) | |
tree | 1cfb9b159a0f7f5095ca571742586c02828f1118 /libstdc++-v3 | |
parent | 3d427cc1c8a0618874d8826acc1da7b392266081 (diff) | |
download | gcc-4bca22f3c2569b1aeb40ffedd03240836881c9bf.zip gcc-4bca22f3c2569b1aeb40ffedd03240836881c9bf.tar.gz gcc-4bca22f3c2569b1aeb40ffedd03240836881c9bf.tar.bz2 |
re PR bootstrap/51985 (Bootstrap failure due to revision 183457)
PR bootstrap/51985
* src/c++98/Makefile.am (libc__98_la_SOURCES,
libc__98convenience_la_SOURCES): Remove $(inst_sources).
* src/c++98/Makefile.in: Regenerated.
From-SVN: r183556
Diffstat (limited to 'libstdc++-v3')
-rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
-rw-r--r-- | libstdc++-v3/src/c++98/Makefile.am | 4 | ||||
-rw-r--r-- | libstdc++-v3/src/c++98/Makefile.in | 8 |
3 files changed, 13 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 501ce76..b9cca6a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2012-01-26 Jakub Jelinek <jakub@redhat.com> + + PR bootstrap/51985 + * src/c++98/Makefile.am (libc__98_la_SOURCES, + libc__98convenience_la_SOURCES): Remove $(inst_sources). + * src/c++98/Makefile.in: Regenerated. + 2012-01-25 Richard Sandiford <rdsandiford@googlemail.com> * testsuite/20_util/system_clock/1.cc: Add dg-require-time. diff --git a/libstdc++-v3/src/c++98/Makefile.am b/libstdc++-v3/src/c++98/Makefile.am index fe39f23..d5d39d1 100644 --- a/libstdc++-v3/src/c++98/Makefile.am +++ b/libstdc++-v3/src/c++98/Makefile.am @@ -156,8 +156,8 @@ sources = \ vpath % $(top_srcdir)/src/c++98 vpath % $(top_srcdir) -libc__98_la_SOURCES = $(sources) $(inst_sources) -libc__98convenience_la_SOURCES = $(sources) $(inst_sources) +libc__98_la_SOURCES = $(sources) +libc__98convenience_la_SOURCES = $(sources) # Use special rules for the deprecated source files so that they find # deprecated include files. diff --git a/libstdc++-v3/src/c++98/Makefile.in b/libstdc++-v3/src/c++98/Makefile.in index dae6f26..5674aa4 100644 --- a/libstdc++-v3/src/c++98/Makefile.in +++ b/libstdc++-v3/src/c++98/Makefile.in @@ -114,10 +114,10 @@ am__objects_6 = bitmap_allocator.lo pool_allocator.lo mt_allocator.lo \ math_stubs_long_double.lo stdexcept.lo strstream.lo tree.lo \ istream.lo streambuf.lo valarray.lo $(am__objects_1) \ $(am__objects_5) -am_libc__98_la_OBJECTS = $(am__objects_6) $(am__objects_2) +am_libc__98_la_OBJECTS = $(am__objects_6) libc__98_la_OBJECTS = $(am_libc__98_la_OBJECTS) libc__98convenience_la_LIBADD = -am_libc__98convenience_la_OBJECTS = $(am__objects_6) $(am__objects_2) +am_libc__98convenience_la_OBJECTS = $(am__objects_6) libc__98convenience_la_OBJECTS = $(am_libc__98convenience_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = @@ -423,8 +423,8 @@ sources = \ ${host_sources} \ ${host_sources_extra} -libc__98_la_SOURCES = $(sources) $(inst_sources) -libc__98convenience_la_SOURCES = $(sources) $(inst_sources) +libc__98_la_SOURCES = $(sources) +libc__98convenience_la_SOURCES = $(sources) # Use special rules for the deprecated source files so that they find # deprecated include files. |