diff mbox

fix relinking libasan and libtsan on installation

Message ID 50F42BD8.2030909@ubuntu.com
State New
Headers show

Commit Message

Matthias Klose Jan. 14, 2013, 4:01 p.m. UTC 
with the recent libsanitizer update, libasan and libtsan got a dependency on
libstdc++.so.6, however when installing into an empty directory, and
libstdc++.so.6 isn't installed there first, both libasan and libtsan are
relinked against the system libstdc++.so.6. So make sure that libstdc++-v3 is
installed first.

ok for the trunk?

  Matthias

Comments

Jakub Jelinek Jan. 14, 2013, 4:09 p.m. UTC | #1 
On Mon, Jan 14, 2013 at 05:01:28PM +0100, Matthias Klose wrote:
> 2013-01-13  Matthias Klose  <doko@ubuntu.com>
> 
> 	* Makefile.def (install-target-libsanitizer): Depend on
> 	install-target-libstdc++-v3.
> 	* Makefile.in: Regenerate.

Okay.

> --- Makefile.def	(Revision 195136)
> +++ Makefile.def	(Arbeitskopie)
> @@ -524,6 +524,7 @@
>  dependencies = { module=install-target-libgo; on=install-target-libatomic; };
>  dependencies = { module=install-target-libgfortran; on=install-target-libquadmath; };
>  dependencies = { module=install-target-libgfortran; on=install-target-libgcc; };
> +dependencies = { module=install-target-libsanitizer; on=install-target-libstdc++-v3; };
>  dependencies = { module=install-target-libsanitizer; on=install-target-libgcc; };
>  dependencies = { module=install-target-libjava; on=install-target-libgcc; };
>  dependencies = { module=install-target-libitm; on=install-target-libgcc; };
> Index: Makefile.in
> ===================================================================
> --- Makefile.in	(Revision 195136)
> +++ Makefile.in	(Arbeitskopie)
> @@ -46216,6 +46216,7 @@
>  install-target-libgo: maybe-install-target-libatomic
>  install-target-libgfortran: maybe-install-target-libquadmath
>  install-target-libgfortran: maybe-install-target-libgcc
> +install-target-libsanitizer: maybe-install-target-libstdc++-v3
>  install-target-libsanitizer: maybe-install-target-libgcc
>  install-target-libjava: maybe-install-target-libgcc
>  install-target-libitm: maybe-install-target-libgcc


	Jakub
diff mbox

Patch

2013-01-13  Matthias Klose  <doko@ubuntu.com>

	* Makefile.def (install-target-libsanitizer): Depend on
	install-target-libstdc++-v3.
	* Makefile.in: Regenerate.

Index: Makefile.def
===================================================================
--- Makefile.def	(Revision 195136)
+++ Makefile.def	(Arbeitskopie)
@@ -524,6 +524,7 @@ 
 dependencies = { module=install-target-libgo; on=install-target-libatomic; };
 dependencies = { module=install-target-libgfortran; on=install-target-libquadmath; };
 dependencies = { module=install-target-libgfortran; on=install-target-libgcc; };
+dependencies = { module=install-target-libsanitizer; on=install-target-libstdc++-v3; };
 dependencies = { module=install-target-libsanitizer; on=install-target-libgcc; };
 dependencies = { module=install-target-libjava; on=install-target-libgcc; };
 dependencies = { module=install-target-libitm; on=install-target-libgcc; };
Index: Makefile.in
===================================================================
--- Makefile.in	(Revision 195136)
+++ Makefile.in	(Arbeitskopie)
@@ -46216,6 +46216,7 @@ 
 install-target-libgo: maybe-install-target-libatomic
 install-target-libgfortran: maybe-install-target-libquadmath
 install-target-libgfortran: maybe-install-target-libgcc
+install-target-libsanitizer: maybe-install-target-libstdc++-v3
 install-target-libsanitizer: maybe-install-target-libgcc
 install-target-libjava: maybe-install-target-libgcc
 install-target-libitm: maybe-install-target-libgcc