aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorDavid Bryant <davidbryant@gvtc.com>2022-11-03 19:24:54 -0500
committerDavid Bryant <davidbryant@gvtc.com>2022-11-03 19:29:02 -0500
commit6dff9ef949bb3567b543ee1cb0bdd0f309fa56bf (patch)
tree11bafddaf2e7fd439bc867a3dc12bfb3ef8e1ae7 /chapter06
parent172185a9f786aedc2842696084faf95249162b04 (diff)
Edit English idiom. punctuation, etc., throughout chapter 6.
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/binutils-pass2.xml10
-rw-r--r--chapter06/file.xml5
-rw-r--r--chapter06/gcc-pass2.xml29
-rw-r--r--chapter06/introduction.xml2
-rw-r--r--chapter06/ncurses.xml12
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 @@
<!-- Don't remove this until Binutils upstream updates the libtool
copy. On some host distros the issue doesn't show up. -->
- <para>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:</para>
+ <para>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:</para>
<screen><userinput remap="pre">sed '6009s/$add_dir//' -i ltmain.sh</userinput></screen>
@@ -83,8 +83,8 @@ cd build</userinput></screen>
<varlistentry>
<term><parameter>--enable-64-bit-bfd</parameter></term>
<listitem>
- <para>Enables 64-bit support (on hosts with narrower word sizes).
- May not be needed on 64-bit systems, but does no harm.</para>
+ <para>Enables 64-bit support (on hosts with smaller word sizes).
+ This may not be needed on 64-bit systems, but it does no harm.</para>
</listitem>
</varlistentry>
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 @@
<para>
The <command>file</command> 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 <command>file</command> command:
</para>
<screen><userinput remap="pre">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 @@
<screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-fixes-patch;</userinput></screen>
-->
<para>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:</para>
+ required. Unpack the tarballs and move them into the required directories:</para>
<screen><userinput remap="pre">tar -xf ../mpfr-&mpfr-version;.tar.xz
mv -v mpfr-&mpfr-version; mpfr
@@ -111,9 +110,9 @@ cd build</userinput></screen>
<para>Normally, using <parameter>--host</parameter> ensures that
a cross-compiler is used for building GCC, and that compiler knows
that it has to look for headers and libraries in <filename
- class="directory">$LFS</filename>. But the build system of GCC uses
+ class="directory">$LFS</filename>. 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 <filename
+ needed so those tools will find the needed files in <filename
class="directory">$LFS</filename>, and not on the host.</para>
</listitem>
</varlistentry>
@@ -121,16 +120,16 @@ cd build</userinput></screen>
<varlistentry>
<term><parameter>--target=$LFS_TGT</parameter></term>
<listitem>
- <para>As we are cross-compiling GCC, it's impossible to build
+ <para>We are cross-compiling GCC, so it's impossible to build
target libraries (<filename class="libraryfile">libgcc</filename>
and <filename class="libraryfile">libstdc++</filename>) 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.</para>
+ previously compiled GCC binaries&mdash;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.</para>
</listitem>
</varlistentry>
@@ -138,9 +137,9 @@ cd build</userinput></screen>
<term><parameter>LDFLAGS_FOR_TARGET=...</parameter></term>
<listitem>
<para>Allow <filename class="libraryfile">libstdc++</filename> to
- use shared <filename class="libraryfile">libgcc</filename> 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 <filename class="libraryfile">libgcc</filename> 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.</para>
</listitem>
</varlistentry>
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.</para>
- <para>Using the utilities will be possible in next chapter after entering
+ <para>Using the utilities will be possible in the next chapter after entering
the <quote>chroot</quote> 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.</para>
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</userinput></screen>
<term><parameter>--without-ada</parameter></term>
<listitem>
<para>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 <command>chroot</command> environment.</para>
</listitem>
</varlistentry>
@@ -127,9 +127,9 @@ popd</userinput></screen>
<varlistentry>
<term><parameter>--disable-stripping</parameter></term>
<listitem>
- <para>This switch prevents the building system from stripping
- the programs using <command>strip</command> program from the host.
- Using host tools on cross-compiled program can cause failure.</para>
+ <para>This switch prevents the building system from
+ using the <command>strip</command> program from the host.
+ Using host tools on cross-compiled programs can cause failure.</para>
</listitem>
</varlistentry>
@@ -169,8 +169,8 @@ echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so</userinput></screen>
<varlistentry>
<term><parameter>TIC_PATH=$(pwd)/build/progs/tic</parameter></term>
<listitem>
- <para>We need to pass the path of the just built
- <command>tic</command> able to run on the building machine, so that
+ <para>We need to pass the path of the newly built
+ <command>tic</command> program that runs on the building machine, so
the terminal database can be created without errors.</para>
</listitem>
</varlistentry>