From e91d8ce6562e58872a291cd110c3f4608b30ce60 Mon Sep 17 00:00:00 2001 From: Gerard Beekmans Date: Sun, 11 May 2003 02:44:11 +0000 Subject: [PATCH] removed tooldir=/stage1. It makes the build unpure again git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2553 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter05/binutils-pass1-inst.xml | 6 +++--- chapter05/binutils-pass2-inst.xml | 8 ++++---- chapter05/lockingglibc.xml | 2 +- chapter06/adjustingtoolchain.xml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/chapter05/binutils-pass1-inst.xml b/chapter05/binutils-pass1-inst.xml index 1d97f1cfe..13f478daa 100644 --- a/chapter05/binutils-pass1-inst.xml +++ b/chapter05/binutils-pass1-inst.xml @@ -31,7 +31,7 @@ statically. Continue with compiling the package: -make tooldir=/stage1 LDFLAGS="-all-static" +make LDFLAGS="-all-static" The meaning of the make option is: @@ -47,10 +47,10 @@ variable. And finish off installing the package: -make tooldir=/stage1 install +make install make -C ld clean -make -C ld tooldir=/stage1 LIB_PATH=/stage1/lib +make -C ld LIB_PATH=/stage1/lib Do not remove the binutils-* directories. We need them again later on in this chapter. diff --git a/chapter05/binutils-pass2-inst.xml b/chapter05/binutils-pass2-inst.xml index f12db20a4..87ca80ec6 100644 --- a/chapter05/binutils-pass2-inst.xml +++ b/chapter05/binutils-pass2-inst.xml @@ -8,12 +8,12 @@ mkdir ../binutils-build cd ../binutils-build ../binutils-&binutils-version;/configure --prefix=/stage1 \     --enable-shared --with-lib-path=/stage1/lib -make tooldir=/stage1 -make tooldir=/stage1 check -make tooldir=/stage1 install +make +make check +make install make -C ld clean -make -C ld tooldir=/stage1 LIB_PATH=/usr/lib:/lib +make -C ld LIB_PATH=/usr/lib:/lib Do not remove the binutils-* directories after the installation. We'll need this directory again in chapter 6 as-is. diff --git a/chapter05/lockingglibc.xml b/chapter05/lockingglibc.xml index b306398be..95d086467 100644 --- a/chapter05/lockingglibc.xml +++ b/chapter05/lockingglibc.xml @@ -7,7 +7,7 @@ Installation of Binutils -make -C ld tooldir=/stage1 install-data-local +make -C ld install-data-local You can remove the binutils-* directories now. diff --git a/chapter06/adjustingtoolchain.xml b/chapter06/adjustingtoolchain.xml index 7add84c7f..6c49c402d 100644 --- a/chapter06/adjustingtoolchain.xml +++ b/chapter06/adjustingtoolchain.xml @@ -3,7 +3,7 @@ cd binutils-build -make -C ld tooldir=/stage1 INSTALL=/stage1/bin/install install-data-local +make -C ld INSTALL=/stage1/bin/install install-data-local SPECFILE=/stage1/lib/gcc-lib/*/*/specs && sed -e 's@/stage1/lib/ld.so.1@/lib/ld.so.1@g' \