aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05
diff options
context:
space:
mode:
authorGerard Beekmans <gerard@linuxfromscratch.org>2003-05-10 23:29:43 +0000
committerGerard Beekmans <gerard@linuxfromscratch.org>2003-05-10 23:29:43 +0000
commita5b2aa952edbfaf52eada536e7a8fe7d8de30bba (patch)
treebf9745d1c8235b1f8877c8f7f5fb2e388ddd463f /chapter05
parentb2d4656229fd2aa088bb1b10a889419cf9cd807c (diff)
add tooldir=/stage1 to binutils install and fix bug in ch6-adjustingtoolchain
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2551 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
-rw-r--r--chapter05/binutils-pass1-inst.xml6
-rw-r--r--chapter05/binutils-pass2-inst.xml11
-rw-r--r--chapter05/kernelheaders-inst.xml3
-rw-r--r--chapter05/lockingglibc.xml2
4 files changed, 11 insertions, 11 deletions
diff --git a/chapter05/binutils-pass1-inst.xml b/chapter05/binutils-pass1-inst.xml
index 53a59fb7b..7aaeb37ca 100644
--- a/chapter05/binutils-pass1-inst.xml
+++ b/chapter05/binutils-pass1-inst.xml
@@ -32,7 +32,7 @@ statically.</para></listitem>
<para>Continue with compiling the package:</para>
-<para><screen><userinput>make LDFLAGS="-all-static -s"</userinput></screen></para>
+<para><screen><userinput>make tooldir=/stage1 LDFLAGS="-all-static -s"</userinput></screen></para>
<para>The meaning of the make option is:</para>
@@ -48,10 +48,10 @@ variable.</para></listitem>
<para>And finish off installing the package:</para>
-<para><screen><userinput>make install</userinput></screen></para>
+<para><screen><userinput>make tooldir=/stage1 install</userinput></screen></para>
<para><screen><userinput>make -C ld clean
-make -C ld LIB_PATH=/stage1/lib</userinput></screen></para>
+make -C ld tooldir=/stage1 LIB_PATH=/stage1/lib</userinput></screen></para>
<para>Do not remove the binutils-* directories. We need them again
later on in this chapter.</para>
diff --git a/chapter05/binutils-pass2-inst.xml b/chapter05/binutils-pass2-inst.xml
index 77b464c17..22eadeceb 100644
--- a/chapter05/binutils-pass2-inst.xml
+++ b/chapter05/binutils-pass2-inst.xml
@@ -8,13 +8,12 @@ mkdir ../binutils-build
cd ../binutils-build
CFLAGS="-O2 -pipe" ../binutils-&binutils-version;/configure --prefix=/stage1 \
&nbsp;&nbsp;&nbsp;&nbsp;--enable-shared --with-lib-path=/stage1/lib
-make LDFLAGS="-s"
-make check
-make install</userinput></screen></para>
+make tooldir=/stage1 LDFLAGS="-s"
+make tooldir=/stage1 check
+make tooldir=/stage1 install</userinput></screen></para>
-<para><screen><userinput>cd ld
-make clean
-make LIB_PATH=/usr/lib:/lib</userinput></screen></para>
+<para><screen><userinput>make -C ld clean
+make -C ld tooldir=/stage1 LIB_PATH=/usr/lib:/lib</userinput></screen></para>
<para>Do not remove the binutils-* directories after the installation.
We'll need this directory again in chapter 6 as-is.</para>
diff --git a/chapter05/kernelheaders-inst.xml b/chapter05/kernelheaders-inst.xml
index 3c2f5fe0d..fc79a0e25 100644
--- a/chapter05/kernelheaders-inst.xml
+++ b/chapter05/kernelheaders-inst.xml
@@ -43,7 +43,8 @@ symlink:</para>
<para>Install the platform specific-header files:</para>
-<para><screen><userinput>cp -HR include/asm /stage1/include &amp;&amp;
+<para><screen><userinput>mkdir /stage1/include/asm &amp;&amp;
+cp include/asm/* /stage1/include/asm &amp;&amp;
cp -R include/asm-generic /stage1/include</userinput></screen></para>
<para>Install the cross-platform kernel header files:</para>
diff --git a/chapter05/lockingglibc.xml b/chapter05/lockingglibc.xml
index 95d086467..b306398be 100644
--- a/chapter05/lockingglibc.xml
+++ b/chapter05/lockingglibc.xml
@@ -7,7 +7,7 @@
<sect2>
<title>Installation of Binutils</title>
-<para><screen><userinput>make -C ld install-data-local</userinput></screen></para>
+<para><screen><userinput>make -C ld tooldir=/stage1 install-data-local</userinput></screen></para>
<para>You can remove the binutils-* directories now.</para>