diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index 2a42cead8..ca2a06f1c 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -43,29 +43,17 @@ Installation of GCC - Our first build of GCC has installed a couple of internal system - headers. Normally one of them, limits.h, will in turn - include the corresponding system limits.h header, in - this case, /tools/include/limits.h. However, at the - time of the first build of gcc /tools/include/limits.h - did not exist, so the internal header that GCC installed is a partial, - self-contained file and does not include the extended features of the - system header. This was adequate for building the temporary libc, but this - build of GCC now requires the full internal header. Create a full version - of the internal header using a command that is identical to what the GCC - build system does in normal circumstances: + 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: -cat gcc/limitx.h gcc/glimits.h gcc/limity.h > \ - `dirname $($LFS_TGT-gcc -print-libgcc-file-name)`/include-fixed/limits.h - Once again, change the location of GCC's default dynamic linker to use the one installed in /tools. @@ -93,17 +81,29 @@ done ;; esac - As in the first build of GCC it requires the GMP, MPFR and MPC - packages. Unpack the tarballs and move them into the required directory - names: + Our first build of GCC has installed a couple of internal system + headers. Normally one of them, limits.h, will in turn + include the corresponding system limits.h header, in + this case, /tools/include/limits.h. However, at the + time of the first build of gcc /tools/include/limits.h + did not exist, so the internal header that GCC installed is a partial, + self-contained file and does not include the extended features of the + system header. This was adequate for building the temporary libc, but this + build of GCC now requires the full internal header. Create a full version + of the internal header using a command that is identical to what the GCC + build system does in normal circumstances: -tar -xf ../mpfr-&mpfr-version;.tar.xz -mv -v mpfr-&mpfr-version; mpfr -tar -xf ../gmp-&gmp-version;.tar.xz -mv -v gmp-&gmp-version; gmp -tar -xf ../mpc-&mpc-version;.tar.gz -mv -v mpc-&mpc-version; mpc +cat gcc/limitx.h gcc/glimits.h gcc/limity.h > \ + `dirname $($LFS_TGT-gcc -print-libgcc-file-name)`/include-fixed/limits.h + Create a separate build directory again: mkdir -v build