From a0b689e8b09aaef27c73a8728aa3341f652bc098 Mon Sep 17 00:00:00 2001 From: Alex Gronenwoud Date: Wed, 11 Feb 2004 22:02:32 +0000 Subject: Adapting the title of the 'Locking in' section. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3249 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter06/chapter06.xml | 31 ++++++++++++++++++------------- chapter06/gcc.xml | 2 +- 2 files changed, 19 insertions(+), 14 deletions(-) (limited to 'chapter06') diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 1012b15a5..eff1c295b 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -357,16 +357,21 @@ file records the bad login attempts. &c6-glibc; - + Re-adjusting the toolchain - - -Now that the new C libraries have been installed, it's time to re-adjust -our toolchain. We'll adjust it so that it will link any newly compiled program -against the new C libraries. Basically, this is the reverse of what we did -in the "locking in" stage in the beginning of the previous chapter. - -The first thing to do is to adjust the linker. For this we retained the + + +Now that the new and final C libraries have been installed, it's time to +adjust our toolchain again. We'll adjust it so that it will link any newly +compiled program against these new libraries. This is in fact the same we did +in the "Adjusting" phase in the beginning of the previous chapter, even though +it looks like the reverse: then we guided the chain from the host's +{,/usr}/lib to the new +/tools/lib, now we guide it from that +same /tools/lib +to the LFS's {,/usr}/lib. + +First we adjust the linker. For this we retained the source and build directories from the second pass over Binutils. Install the adjusted linker by running the following from within the binutils-build directory: @@ -378,10 +383,10 @@ source and build directories from the second pass in , or otherwise accidentally deleted them or just don't have access to them, don't worry, all is not lost. Just ignore the above command. The result will be that the next package, Binutils, will link against -the Glibc libraries in /tools rather -than /usr. This is not ideal, however, -our testing has shown that the resulting Binutils program binaries should be -identical. +the C libraries in /tools rather +than {,/usr}/lib. This is not ideal, +however, our testing has shown that the resulting Binutils program binaries +should be identical. From now on every compiled program will link only against the libraries in /usr/lib and diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index 7cf0f81a4..bb9467167 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -90,7 +90,7 @@ compiler. To satisfy those packages, create a symlink: At this point it is strongly recommended to repeat the sanity check we performed earlier in this chapter. Refer back to - and repeat the check. If the results + and repeat the check. If the results are wrong, then most likely you erroneously applied the GCC Specs patch from . -- cgit v1.2.3-54-g00ecf