diff options
| -rw-r--r-- | chapter05/binutils-pass1.xml | 2 | ||||
| -rw-r--r-- | chapter05/gcc-pass1.xml | 14 | ||||
| -rw-r--r-- | chapter05/glibc.xml | 38 | ||||
| -rw-r--r-- | chapter05/libstdc++.xml | 22 |
4 files changed, 38 insertions, 38 deletions
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml index 4dab2b1a5..65e8dd2ae 100644 --- a/chapter05/binutils-pass1.xml +++ b/chapter05/binutils-pass1.xml @@ -84,7 +84,7 @@ cd build</userinput></screen> <term><parameter>--prefix=$LFS/tools</parameter></term> <listitem> <para>This tells the configure script to prepare to install the - binutils programs in the <filename + Binutils programs in the <filename class="directory">$LFS/tools</filename> directory.</para> </listitem> </varlistentry> diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index 2aace5d2b..89e163b6b 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -50,9 +50,9 @@ use them:</para> <note><para>There are frequent misunderstandings about this chapter. The - procedures are the same as every other chapter as explained earlier (<xref - linkend='buildinstr'/>). First extract the gcc tarball from the sources - directory and then change to the directory created. Only then should you + procedures are the same as every other chapter, as explained earlier (<xref + linkend='buildinstr'/>). First, extract the gcc-&gcc-version; tarball from the sources + directory, and then change to the directory created. Only then should you proceed with the instructions below.</para></note> <screen><userinput remap="pre">tar -xf ../mpfr-&mpfr-version;.tar.xz @@ -107,9 +107,9 @@ cd build</userinput></screen> <varlistentry> <term><parameter>--with-glibc-version=&glibc-version;</parameter></term> <listitem> - <para>This option specifies the version of glibc which will be + <para>This option specifies the version of Glibc which will be used on the target. It is not relevant to the libc of the host - distro because everything compiled by pass1 gcc will run in the + distro because everything compiled by pass1 GCC will run in the chroot environment, which is isolated from libc of the host distro.</para> </listitem> @@ -152,7 +152,7 @@ cd build</userinput></screen> <term><parameter>--disable-shared</parameter></term> <listitem> <para>This switch forces GCC to link its internal libraries - statically. We need this because the shared libraries require glibc, + statically. We need this because the shared libraries require Glibc, which is not yet installed on the target system.</para> </listitem> </varlistentry> @@ -204,7 +204,7 @@ cd build</userinput></screen> time of this build of GCC <filename>$LFS/usr/include/limits.h</filename> does not exist, so the internal header that has just been installed is a partial, self-contained file and does not include the extended features of - the system header. This is adequate for building glibc, but the full + the system header. This is adequate for building Glibc, but the full internal header will be needed later. Create a full version of the internal header using a command that is identical to what the GCC build system does in normal circumstances:</para> diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 7b118c540..6b78031bc 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -58,13 +58,13 @@ esac</userinput></screen> <note> <para> The above command is correct. The <command>ln</command> command has - a few syntactic versions, so be sure to check + several syntactic versions, so be sure to check <command>info coreutils ln</command> and <filename>ln(1)</filename> - before reporting what you may think is an error. + before reporting what may appear to be an error. </para> </note> - <para>Some of the Glibc programs use the non-FHS compliant + <para>Some of the Glibc programs use the non-FHS-compliant <filename class="directory">/var/db</filename> directory to store their runtime data. Apply the following patch to make such programs store their runtime data in the FHS-compliant locations:</para> @@ -128,7 +128,7 @@ cd build</userinput></screen> <term><parameter>libc_cv_slibdir=/usr/lib</parameter></term> <listitem> <para>This ensures that the library is installed in /usr/lib instead - of the default /lib64 on 64 bit machines.</para> + of the default /lib64 on 64-bit machines.</para> </listitem> </varlistentry> @@ -146,11 +146,11 @@ cd build</userinput></screen> <para>The missing or incompatible <command>msgfmt</command> program is generally harmless. This <command>msgfmt</command> program is part of the - Gettext package which the host distribution should provide.</para> + Gettext package, which the host distribution should provide.</para> <note><para>There have been reports that this package may fail when - building as a "parallel make". If this occurs, rerun the make command - with a "-j1" option.</para></note> + building as a "parallel make". If that occurs, rerun the make command + with the "-j1" option.</para></note> <para>Compile the package:</para> @@ -161,9 +161,9 @@ cd build</userinput></screen> <warning><para>If <envar>LFS</envar> is not properly set, and despite the recommendations, you are building as <systemitem class="username">root</systemitem>, the next command will - install the newly built glibc to your host system, which most likely - will render it unusable. So double check that the environment is - correctly set, before running the following command.</para></warning> + install the newly built Glibc to your host system, which will almost + certainly render it unusable. So double-check that the environment is + correctly set, and that you are not &root;, before running the following command.</para></warning> <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen> @@ -177,15 +177,15 @@ cd build</userinput></screen> packages to define the location where the package should be installed. If it is not set, it defaults to the root (<filename class="directory">/</filename>) directory. Here we specify that - the package be installed in <filename class="directory">$LFS - </filename>, which will become the root after <xref linkend= + the package is installed in <filename class="directory">$LFS + </filename>, which will become the root directory in <xref linkend= "ch-tools-chroot"/>.</para> </listitem> </varlistentry> </variablelist> - <para>Fix hardcoded path to the executable loader in + <para>Fix a hard coded path to the executable loader in the <command>ldd</command> script:</para> <screen><userinput remap="install">sed '/RTLDLIST=/s@/usr@@g' -i $LFS/usr/bin/ldd</userinput></screen> @@ -206,10 +206,10 @@ readelf -l a.out | grep ld-linux</userinput></screen> <para>Note that for 32-bit machines, the interpreter name will be <filename>/lib/ld-linux.so.2</filename>.</para> - <para>If the output is not shown as above or there was no output at all, + <para>If the output is not as shown above, or there is no output at all, then something is wrong. Investigate and retrace the steps to find out where the problem is and correct it. This issue must be resolved before - continuing on.</para> + continuing.</para> <para>Once all is well, clean up the test file:</para> @@ -217,14 +217,14 @@ readelf -l a.out | grep ld-linux</userinput></screen> </caution> - <note><para>Building packages in the next chapter will serve as an + <note><para>Building the packages in the next chapter will serve as an additional check that the toolchain has been built properly. If some - package, especially binutils-pass2 or gcc-pass2, fails to build, it is + package, especially Binutils-pass2 or GCC-pass2, fails to build, it is an indication that something has gone wrong with the - previous Binutils, GCC, or Glibc installations.</para></note> + preceding Binutils, GCC, or Glibc installations.</para></note> <para>Now that our cross-toolchain is complete, finalize the installation - of the limits.h header. For doing so, run a utility provided by the GCC + of the limits.h header. To do this, run a utility provided by the GCC developers:</para> <screen><userinput>$LFS/tools/libexec/gcc/$LFS_TGT/&gcc-version;/install-tools/mkheaders</userinput></screen> diff --git a/chapter05/libstdc++.xml b/chapter05/libstdc++.xml index c02c9aff8..e0ea2e790 100644 --- a/chapter05/libstdc++.xml +++ b/chapter05/libstdc++.xml @@ -28,7 +28,7 @@ to compile C++ code (part of GCC is written in C++), but we had to defer its installation when we built <xref linkend="ch-tools-gcc-pass1"/> - because it depends on glibc, which was not yet available in the target + because Libstdc++ depends on Glibc, which was not yet available in the target directory. </para> @@ -53,12 +53,12 @@ <filename>gcc-&gcc-version;</filename> directory.</para> </note> - <para>Create a separate build directory for libstdc++ and enter it:</para> + <para>Create a separate build directory for Libstdc++ and enter it:</para> <screen><userinput remap="pre">mkdir -v build cd build</userinput></screen> - <para>Prepare libstdc++ for compilation:</para> + <para>Prepare Libstdc++ for compilation:</para> <screen><userinput remap="configure">../libstdc++-v3/configure \ --host=$LFS_TGT \ @@ -75,7 +75,7 @@ cd build</userinput></screen> <varlistentry> <term><parameter>--host=...</parameter></term> <listitem> - <para>Specifies that the cross compiler we have just built + <para>Specifies that the cross-compiler we have just built should be used instead of the one in <filename>/usr/bin</filename>.</para> </listitem> @@ -93,27 +93,27 @@ cd build</userinput></screen> <term><parameter>--with-gxx-include-dir=/tools/$LFS_TGT/include/c++/&gcc-version;</parameter></term> <listitem> <para>This specifies the installation directory for include files. - Because libstdc++ is the standard C++ library for LFS, this + Because Libstdc++ is the standard C++ library for LFS, this directory should match the location where the C++ compiler (<command>$LFS_TGT-g++</command>) would search for the standard C++ include files. In a normal build, this information - is automatically passed to the libstdc++ <command>configure</command> + is automatically passed to the Libstdc++ <command>configure</command> options from the top level directory. In our case, this information must be explicitly given. The C++ compiler will prepend the sysroot path - <filename class="directory">$LFS</filename> (specified building - GCC pass 1) to the include file search path, so it will actually + <filename class="directory">$LFS</filename> (specified when building + GCC-pass1) to the include file search path, so it will actually search in <filename class="directory">$LFS/tools/$LFS_TGT/include/c++/&gcc-version;</filename>. The combination of the <parameter>DESTDIR</parameter> variable (in the <command>make install</command> command below) - and this switch ensures to install the headers there.</para> + and this switch causes the headers to be installed there.</para> </listitem> </varlistentry> </variablelist> - <para>Compile libstdc++ by running:</para> + <para>Compile Libstdc++ by running:</para> <screen><userinput remap="make">make</userinput></screen> @@ -122,7 +122,7 @@ cd build</userinput></screen> <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen> <para>Remove the libtool archive files because they are harmful for - cross compilation:</para> + cross-compilation:</para> <screen><userinput remap="install">rm -v $LFS/usr/lib/lib{stdc++,stdc++fs,supc++}.la</userinput></screen> |