Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
Date: Wed, 28 Jan 2009 21:00:29
Message-Id: E1LSHWN-0008GY-Dm@stork.gentoo.org
1 vapier 09/01/28 21:00:27
2
3 Modified: toolchain.eclass
4 Log:
5 use emake rather than make
6
7 Revision Changes Path
8 1.385 eclass/toolchain.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.385&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.385&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.384&r2=1.385
13
14 Index: toolchain.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
17 retrieving revision 1.384
18 retrieving revision 1.385
19 diff -u -r1.384 -r1.385
20 --- toolchain.eclass 28 Jan 2009 05:22:05 -0000 1.384
21 +++ toolchain.eclass 28 Jan 2009 21:00:27 -0000 1.385
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2008 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.384 2009/01/28 05:22:05 vapier Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.385 2009/01/28 21:00:27 vapier Exp $
27 #
28 # Maintainer: Toolchain Ninjas <toolchain@g.o>
29
30 @@ -1485,7 +1485,6 @@
31 fi
32
33 pushd "${WORKDIR}"/build
34 - einfo "Running make LDFLAGS=\"${LDFLAGS}\" STAGE1_CFLAGS=\"${STAGE1_CFLAGS}\" LIBPATH=\"${LIBPATH}\" BOOT_CFLAGS=\"${BOOT_CFLAGS}\" ${GCC_MAKE_TARGET}"
35
36 emake \
37 LDFLAGS="${LDFLAGS}" \
38 @@ -1644,11 +1643,10 @@
39 }
40
41 gcc-library_src_install() {
42 - einfo "Installing ${PN} ..."
43 # Do the 'make install' from the build directory
44 cd "${WORKDIR}"/build
45 S=${WORKDIR}/build \
46 - make DESTDIR="${D}" \
47 + emake DESTDIR="${D}" \
48 prefix=${PREFIX} \
49 bindir=${BINPATH} \
50 includedir=${LIBPATH}/include \
51 @@ -1696,11 +1694,10 @@
52 grep -q 'It has been auto-edited by fixincludes from' "${x}" \
53 && rm -f "${x}"
54 done
55 - einfo "Installing GCC..."
56 # Do the 'make install' from the build directory
57 cd "${WORKDIR}"/build
58 S=${WORKDIR}/build \
59 - make DESTDIR="${D}" install || die
60 + emake DESTDIR="${D}" install || die
61 # Punt some tools which are really only useful while building gcc
62 find "${D}" -name install-tools -prune -type d -exec rm -rf "{}" \;
63 # This one comes with binutils