From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 13 Feb 2015 13:05:59 +0000 (+0000)
Subject: gcc-target: Don't install target gcc libdir files
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=e80025efbfc8e8df01950045975d103b6d7f87b4;p=openembedded-core.git

gcc-target: Don't install target gcc libdir files

Installing /usr/lib/gcc/* means we'd have two copies, one from gcc-cross
and one from here. These can confuse gcc cross where includes use #include_next
and builds track file dependencies (e.g. perl and its makedepends code).
For determinism we don't install this to the sysroot, ever and rely on the
copy from gcc-cross.

[YOCTO #7287]

(From OE-Core rev: 15b3324b769dc92e1b0d4b9da9fbfccbc8dde9dd)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc
index a266f16edf..4c3eea6851 100644
--- a/meta/recipes-devtools/gcc/gcc-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-target.inc
@@ -166,3 +166,12 @@ do_install () {
 
 	chown -R root:root ${D}
 }
+
+# Installing /usr/lib/gcc/* means we'd have two copies, one from gcc-cross
+# and one from here. These can confuse gcc cross where includes use #include_next
+# and builds track file dependencies (e.g. perl and its makedepends code).
+# For determinism we don't install this ever and rely on the copy from gcc-cross.
+# [YOCTO #7287]
+sysroot_stage_dirs_append () {
+	rm -rf $to${libdir}/gcc
+}