summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorRyan Hill <rhill@gentoo.org>2013-10-15 05:36:26 +0000
committerRyan Hill <rhill@gentoo.org>2013-10-15 05:36:26 +0000
commit1a205bb86a9f99babc5a6b78cff9735ca45d7e0a (patch)
treeacfceb76fcb79fb1b577bd9993002ec60f4f9640 /eclass
parentFix vp9 support by switching to bundled libvpx (bug #487926 by Paul Marks). (diff)
downloadhistorical-1a205bb86a9f99babc5a6b78cff9735ca45d7e0a.tar.gz
historical-1a205bb86a9f99babc5a6b78cff9735ca45d7e0a.tar.bz2
historical-1a205bb86a9f99babc5a6b78cff9735ca45d7e0a.zip
Remove .la files for libasan and libtsan. They reference non-existent
libstdc++.la when fixlafiles is disabled/unsupported, and -fsanitize doesn't work with -static anyways. (bug #487550)
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog7
-rw-r--r--eclass/toolchain.eclass3
2 files changed, 8 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 7a800406c582..cf69e613e88f 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1025 2013/10/14 20:30:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1026 2013/10/15 05:36:26 dirtyepic Exp $
+
+ 15 Oct 2013; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass:
+ Remove .la files for libasan and libtsan. They reference non-existent
+ libstdc++.la when fixlafiles is disabled/unsupported, and -fsanitize doesn't
+ work with -static anyways. (bug #487550)
14 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Fix over-use of ||die.
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 493984595704..a227391c676f 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.600 2013/08/15 04:39:24 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.601 2013/10/15 05:36:26 dirtyepic Exp $
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1640,6 +1640,7 @@ toolchain_src_install() {
if tc_version_is_at_least 4.0 ; then
newins "${GCC_FILESDIR}"/awk/fixlafiles.awk-no_gcc_la fixlafiles.awk || die
find "${D}/${LIBPATH}" -name libstdc++.la -type f -exec rm "{}" \;
+ find "${D}/${LIBPATH}" -name "lib?san.la" -type f -exec rm "{}" \; # 487550
else
doins "${GCC_FILESDIR}"/awk/fixlafiles.awk || die
fi