Gentoo Archives: gentoo-dev

From: Michael Haubenwallner <haubi@g.o>
To: gentoo-dev@l.g.o
Cc: Michael Haubenwallner <haubi@g.o>
Subject: [gentoo-dev] [PATCH 2/5] toolchain.eclass: D->ED for where to start cleanups
Date: Wed, 20 Jun 2018 17:50:16
Message-Id: 20180620174905.7733-3-haubi@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/5] toolchain.eclass: Prefix patches, Cygwin related by Michael Haubenwallner
1 ---
2 eclass/toolchain.eclass | 10 +++++-----
3 1 file changed, 5 insertions(+), 5 deletions(-)
4
5 diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
6 index fe41a80db28..a51d8e84f5e 100644
7 --- a/eclass/toolchain.eclass
8 +++ b/eclass/toolchain.eclass
9 @@ -1720,9 +1720,9 @@ toolchain_src_install() {
10 S="${WORKDIR}"/build emake -j1 DESTDIR="${D}" install || die
11
12 # Punt some tools which are really only useful while building gcc
13 - find "${D}" -name install-tools -prune -type d -exec rm -rf "{}" \;
14 + find "${ED}" -name install-tools -prune -type d -exec rm -rf "{}" \;
15 # This one comes with binutils
16 - find "${D}" -name libiberty.a -delete
17 + find "${ED}" -name libiberty.a -delete
18
19 # Move the libraries to the proper location
20 gcc_movelibs
21 @@ -1731,7 +1731,7 @@ toolchain_src_install() {
22 if ! is_crosscompile ; then
23 local EXEEXT
24 eval $(grep ^EXEEXT= "${WORKDIR}"/build/gcc/config.log)
25 - [[ -r ${D}${BINPATH}/gcc${EXEEXT} ]] || die "gcc not found in ${D}"
26 + [[ -r ${D}${BINPATH}/gcc${EXEEXT} ]] || die "gcc not found in ${ED}"
27 fi
28
29 dodir /etc/env.d/gcc
30 @@ -1810,7 +1810,7 @@ toolchain_src_install() {
31 || prepman "${DATAPATH#${EPREFIX}}"
32 fi
33 # prune empty dirs left behind
34 - find "${D}" -depth -type d -delete 2>/dev/null
35 + find "${ED}" -depth -type d -delete 2>/dev/null
36
37 # install testsuite results
38 if use regression-test; then
39 @@ -1966,7 +1966,7 @@ gcc_movelibs() {
40 for FROMDIR in ${removedirs} ; do
41 rmdir "${D}"${FROMDIR} >& /dev/null
42 done
43 - find -depth "${D}" -type d -exec rmdir {} + >& /dev/null
44 + find -depth "${ED}" -type d -exec rmdir {} + >& /dev/null
45 }
46
47 # make sure the libtool archives have libdir set to where they actually
48 --
49 2.16.1