Re: [GOOGLE] Fix bad merge of libstdc++-v3/libsupc++/Makefile.am

2013-05-23 Thread Diego Novillo
On 2013-05-23 08:43 , Evgeniy Stepanov wrote: Hi, r194664 in google/gcc-4_7 lost one line in libstdc++-v3/libsupc++/Makefile.am and did not regenerate Makefile.in (it seems to have been edited manually). Now re-running automake in libstdc++ results in a non-trivial diff. The attached patch upd

[GOOGLE] Fix bad merge of libstdc++-v3/libsupc++/Makefile.am

2013-05-23 Thread Evgeniy Stepanov
Hi, r194664 in google/gcc-4_7 lost one line in libstdc++-v3/libsupc++/Makefile.am and did not regenerate Makefile.in (it seems to have been edited manually). Now re-running automake in libstdc++ results in a non-trivial diff. The attached patch updates Makefile.am. With this patch the difference