From 6dff9ef949bb3567b543ee1cb0bdd0f309fa56bf Mon Sep 17 00:00:00 2001 From: David Bryant Date: Thu, 3 Nov 2022 19:24:54 -0500 Subject: [PATCH] Edit English idiom. punctuation, etc., throughout chapter 6. --- chapter06/binutils-pass2.xml | 10 +++++----- chapter06/file.xml | 5 +++-- chapter06/gcc-pass2.xml | 29 ++++++++++++++--------------- chapter06/introduction.xml | 2 +- chapter06/ncurses.xml | 12 ++++++------ 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/chapter06/binutils-pass2.xml b/chapter06/binutils-pass2.xml index 8766b71e9..ef5c18433 100644 --- a/chapter06/binutils-pass2.xml +++ b/chapter06/binutils-pass2.xml @@ -45,9 +45,9 @@ - Binutils ships an outdated libtool copy in the tarball. It lacks - sysroot support so the produced binaries will be mistakenly linked to - libraries from the host distro. Workaround this issue: + Binutils ships an outdated copy of libtool in the tarball. It lacks + sysroot support, so the produced binaries will be mistakenly linked to + libraries from the host distro. Work around this issue: sed '6009s/$add_dir//' -i ltmain.sh @@ -83,8 +83,8 @@ cd build --enable-64-bit-bfd - Enables 64-bit support (on hosts with narrower word sizes). - May not be needed on 64-bit systems, but does no harm. + Enables 64-bit support (on hosts with smaller word sizes). + This may not be needed on 64-bit systems, but it does no harm. diff --git a/chapter06/file.xml b/chapter06/file.xml index 19d5ae369..425a9bf58 100644 --- a/chapter06/file.xml +++ b/chapter06/file.xml @@ -45,8 +45,9 @@ The file command on the build host needs - to be same version as the one we are building in order to - create the signature file. Run the following commands to build it: + to be the same version as the one we are building in order to + create the signature file. Run the following commands to make a + temporary copy of the file command: mkdir build diff --git a/chapter06/gcc-pass2.xml b/chapter06/gcc-pass2.xml index 6774134a2..24e14a346 100644 --- a/chapter06/gcc-pass2.xml +++ b/chapter06/gcc-pass2.xml @@ -48,8 +48,7 @@ patch -Np1 -i ../&gcc-upstream-fixes-patch; --> As in the first build of GCC, the GMP, MPFR, and MPC packages are - required. Unpack the tarballs and move them into the required directory - names: + required. Unpack the tarballs and move them into the required directories: tar -xf ../mpfr-&mpfr-version;.tar.xz mv -v mpfr-&mpfr-version; mpfr @@ -111,9 +110,9 @@ cd build Normally, using --host ensures that a cross-compiler is used for building GCC, and that compiler knows that it has to look for headers and libraries in $LFS. But the build system of GCC uses + class="directory">$LFS. But the build system for GCC uses other tools, which are not aware of this location. This switch is - needed to have them find the needed files in $LFS, and not on the host. @@ -121,16 +120,16 @@ cd build --target=$LFS_TGT - As we are cross-compiling GCC, it's impossible to build + We are cross-compiling GCC, so it's impossible to build target libraries (libgcc and libstdc++) with the - compiled GCC binaries because these binaries won't run on the - host distro. GCC building system will attempt to use the - C and C++ compilers on the host distro as a workaround by default. - It's not supported to build GCC target libraries with a different - version of GCC, so using host compilers may cause building - failure. This parameter ensures to build the libraries with GCC - pass 1 and prevent the issue. + previously compiled GCC binaries—those binaries won't run on the + host. The GCC build system will attempt to use the host's + C and C++ compilers as a workaround by default. + Building the GCC target libraries with a different + version of GCC is not supported, so using the host's compilers may cause + the build to fail. This parameter ensures the libraries are built by GCC + pass 1. @@ -138,9 +137,9 @@ cd build LDFLAGS_FOR_TARGET=... Allow libstdc++ to - use shared libgcc being - built in this pass, instead of the static version built in GCC - pass 1. This is needed for supporting C++ exception + use the shared libgcc being + built in this pass, instead of the static version that was built in GCC + pass 1. This is necessary to support C++ exception handling. diff --git a/chapter06/introduction.xml b/chapter06/introduction.xml index 1d786eb0c..a0ecb1ef1 100644 --- a/chapter06/introduction.xml +++ b/chapter06/introduction.xml @@ -16,7 +16,7 @@ the host's tools. Nevertheless, the installed libraries are used when linking. - Using the utilities will be possible in next chapter after entering + Using the utilities will be possible in the next chapter after entering the chroot environment. But all the packages built in the present chapter need to be built before we do that. Therefore we cannot be independent of the host system yet. diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index d9457c081..9e7764ecf 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -119,7 +119,7 @@ popd --without-ada This ensures that Ncurses does not build support for the Ada - compiler which may be present on the host but will not be available + compiler, which may be present on the host but will not be available once we enter the chroot environment. @@ -127,9 +127,9 @@ popd --disable-stripping - This switch prevents the building system from stripping - the programs using strip program from the host. - Using host tools on cross-compiled program can cause failure. + This switch prevents the building system from + using the strip program from the host. + Using host tools on cross-compiled programs can cause failure. @@ -169,8 +169,8 @@ echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so TIC_PATH=$(pwd)/build/progs/tic - We need to pass the path of the just built - tic able to run on the building machine, so that + We need to pass the path of the newly built + tic program that runs on the building machine, so the terminal database can be created without errors.