summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-04-15 16:18:27 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-07 13:03:30 +0100
commit426be0f2aecb00533d7edde1191c5d33636a730c (patch)
treeeca13b2c7f0585d9186ea68166d60485064aebef /meta/recipes-devtools
parent9960536181b66210d536e16898cc194948dd8da4 (diff)
downloadpoky-426be0f2aecb00533d7edde1191c5d33636a730c.tar.gz
gcc: Configure all gccs with --disable-install-libiberty
OE uses libiberty from binutils, since its properly compiled as pic archive and applications and other libraries needing libiberty can properly link with it. With this option applied, explicit delete of libiberty headers and libraries is not required in install step, since they wont get installed in first place. (From OE-Core rev: b6f1def25cbb477549fad48e9586cef3ada2f9e5) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian.inc6
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross.inc4
-rw-r--r--meta/recipes-devtools/gcc/gcc-target.inc4
4 files changed, 1 insertions, 14 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index bb4f6923f2..a64c4caf00 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -33,6 +33,7 @@ EXTRA_OECONF = "\
33 --enable-libstdcxx-pch \ 33 --enable-libstdcxx-pch \
34 --program-prefix=${TARGET_PREFIX} \ 34 --program-prefix=${TARGET_PREFIX} \
35 --without-local-prefix \ 35 --without-local-prefix \
36 --disable-install-libiberty \
36 ${EXTRA_OECONF_BASE} \ 37 ${EXTRA_OECONF_BASE} \
37 ${EXTRA_OECONF_GCC_FLOAT} \ 38 ${EXTRA_OECONF_GCC_FLOAT} \
38 ${EXTRA_OECONF_PATHS} \ 39 ${EXTRA_OECONF_PATHS} \
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index 4aac345bec..553ef7fe62 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -108,12 +108,6 @@ do_install () {
108 # We don't care about the gcc-<version> copies 108 # We don't care about the gcc-<version> copies
109 rm -f ${D}${bindir}/*gcc-?.?* 109 rm -f ${D}${bindir}/*gcc-?.?*
110 110
111 # We use libiberty from binutils
112 rm -f ${D}${prefix}/${TARGET_SYS}/lib/libiberty.a
113 # Not sure where the strange paths come from
114 rm -f ${D}${libdir}/../lib/libiberty.a
115 rm -f ${D}${libdir}/libiberty.a
116
117 # Cleanup empty directories which are not shipped 111 # Cleanup empty directories which are not shipped
118 # we use rmdir instead of 'rm -f' to ensure the non empty directories are not deleted 112 # we use rmdir instead of 'rm -f' to ensure the non empty directories are not deleted
119 # ${D}${libdir}/../lib only seems to appear with SDKMACHINE=i686 113 # ${D}${libdir}/../lib only seems to appear with SDKMACHINE=i686
diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index c68cdd5dc4..6fa8c274cd 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -117,10 +117,6 @@ do_install () {
117 cp ${S}/libquadmath/quadmath.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ 117 cp ${S}/libquadmath/quadmath.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
118 cp ${S}/libquadmath/quadmath_weak.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ 118 cp ${S}/libquadmath/quadmath_weak.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
119 119
120 # We use libiberty from binutils
121 find ${D}${exec_prefix}/lib -name libiberty.a | xargs rm -f
122 find ${D}${exec_prefix}/lib -name libiberty.h | xargs rm -f
123
124 find ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed -type f -not -name "README" -not -name limits.h -not -name syslimits.h | xargs rm -f 120 find ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed -type f -not -name "README" -not -name limits.h -not -name syslimits.h | xargs rm -f
125} 121}
126 122
diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc
index 34c1b2263b..8cb432780f 100644
--- a/meta/recipes-devtools/gcc/gcc-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-target.inc
@@ -192,10 +192,6 @@ do_install () {
192 # We don't care about the gcc-<version> ones for this 192 # We don't care about the gcc-<version> ones for this
193 rm -f *gcc-?.?* 193 rm -f *gcc-?.?*
194 194
195 # We use libiberty from binutils
196 find ${D}${libdir} -name libiberty.a | xargs rm -f
197 find ${D}${libdir} -name libiberty.h | xargs rm -f
198
199 # Not sure why we end up with these but we don't want them... 195 # Not sure why we end up with these but we don't want them...
200 rm -f ${TARGET_PREFIX}${TARGET_PREFIX}* 196 rm -f ${TARGET_PREFIX}${TARGET_PREFIX}*
201 197