This is the mail archive of the libstdc++@gcc.gnu.org mailing list for the libstdc++ project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

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

From: Diego Novillo <dnovillo at google dot com>
To: Evgeniy Stepanov <eugenis at google dot com>
Cc: Kostya Serebryany <kcc at google dot com>, "gcc-patches at gcc dot gnu dot org" <gcc-patches at gcc dot gnu dot org>, libstdc++ <libstdc++ at gcc dot gnu dot org>
Date: Thu, 23 May 2013 09:07:51 -0400
Subject: Re: [GOOGLE] Fix bad merge of libstdc++-v3/libsupc++/Makefile.am
References: <CAFKCwrhBGsoaTPa7hF-DFhE+V=R4oQvJgZAV9+=i0D7EyBWJiA at mail dot gmail dot com>

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 updates Makefile.am. With this patch the difference
in generated files becomes trivial (line breaks only).


OK.


Diego.

References:
- [GOOGLE] Fix bad merge of libstdc++-v3/libsupc++/Makefile.am
  - From: Evgeniy Stepanov

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]