| 1 |
commit: 8d56b2daec54b0c8297251fc9434e69184ee64fb |
| 2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 20 16:50:18 2018 +0000 |
| 4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 9 16:20:11 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d56b2da |
| 7 |
|
| 8 |
toolchain.eclass: D->ED for where to start cleanups |
| 9 |
|
| 10 |
eclass/toolchain.eclass | 10 +++++----- |
| 11 |
1 file changed, 5 insertions(+), 5 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
| 14 |
index 485fe6f22c1..9a0080af57e 100644 |
| 15 |
--- a/eclass/toolchain.eclass |
| 16 |
+++ b/eclass/toolchain.eclass |
| 17 |
@@ -1722,9 +1722,9 @@ toolchain_src_install() { |
| 18 |
S="${WORKDIR}"/build emake -j1 DESTDIR="${D}" install || die |
| 19 |
|
| 20 |
# Punt some tools which are really only useful while building gcc |
| 21 |
- find "${D}" -name install-tools -prune -type d -exec rm -rf "{}" \; |
| 22 |
+ find "${ED}" -name install-tools -prune -type d -exec rm -rf "{}" \; |
| 23 |
# This one comes with binutils |
| 24 |
- find "${D}" -name libiberty.a -delete |
| 25 |
+ find "${ED}" -name libiberty.a -delete |
| 26 |
|
| 27 |
# Move the libraries to the proper location |
| 28 |
gcc_movelibs |
| 29 |
@@ -1733,7 +1733,7 @@ toolchain_src_install() { |
| 30 |
if ! is_crosscompile ; then |
| 31 |
local EXEEXT |
| 32 |
eval $(grep ^EXEEXT= "${WORKDIR}"/build/gcc/config.log) |
| 33 |
- [[ -r ${D}${BINPATH}/gcc${EXEEXT} ]] || die "gcc not found in ${D}" |
| 34 |
+ [[ -r ${D}${BINPATH}/gcc${EXEEXT} ]] || die "gcc not found in ${ED}" |
| 35 |
fi |
| 36 |
|
| 37 |
dodir /etc/env.d/gcc |
| 38 |
@@ -1812,7 +1812,7 @@ toolchain_src_install() { |
| 39 |
|| prepman "${DATAPATH#${EPREFIX}}" |
| 40 |
fi |
| 41 |
# prune empty dirs left behind |
| 42 |
- find "${D}" -depth -type d -delete 2>/dev/null |
| 43 |
+ find "${ED}" -depth -type d -delete 2>/dev/null |
| 44 |
|
| 45 |
# install testsuite results |
| 46 |
if use regression-test; then |
| 47 |
@@ -1968,7 +1968,7 @@ gcc_movelibs() { |
| 48 |
for FROMDIR in ${removedirs} ; do |
| 49 |
rmdir "${D}"${FROMDIR} >& /dev/null |
| 50 |
done |
| 51 |
- find -depth "${D}" -type d -exec rmdir {} + >& /dev/null |
| 52 |
+ find -depth "${ED}" -type d -exec rmdir {} + >& /dev/null |
| 53 |
} |
| 54 |
|
| 55 |
# make sure the libtool archives have libdir set to where they actually |
Archives