diff options
| -rw-r--r-- | chapter05/binutils-pass1.xml | 2 | ||||
| -rw-r--r-- | chapter05/binutils-pass2.xml | 12 | ||||
| -rw-r--r-- | chapter05/gcc-pass1.xml | 44 | ||||
| -rw-r--r-- | chapter05/gcc-pass2.xml | 35 | ||||
| -rw-r--r-- | chapter05/glibc.xml | 14 | ||||
| -rw-r--r-- | chapter06/adjusting.xml | 4 | ||||
| -rw-r--r-- | chapter06/glibc.xml | 2 |
7 files changed, 57 insertions, 56 deletions
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml index e30f3962e..b07971f5c 100644 --- a/chapter05/binutils-pass1.xml +++ b/chapter05/binutils-pass1.xml @@ -78,7 +78,7 @@ cd ../binutils-build</userinput></screen> <para>Now prepare Binutils for compilation:</para> -<screen><userinput remap="configure">../binutils-&binutils-version;/configure \ +<screen><userinput remap="configure">../binutils-&binutils-version;/configure \ --prefix=/tools \ --with-sysroot=$LFS \ --with-lib-path=/tools/lib \ diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml index 7c99eac5f..d2e2b5306 100644 --- a/chapter05/binutils-pass2.xml +++ b/chapter05/binutils-pass2.xml @@ -56,12 +56,12 @@ cd ../binutils-build</userinput></screen> <para>Prepare Binutils for compilation:</para> -<screen><userinput remap="configure">CC=$LFS_TGT-gcc \ -AR=$LFS_TGT-ar \ -RANLIB=$LFS_TGT-ranlib \ -../binutils-&binutils-version;/configure \ - --prefix=/tools \ - --disable-nls \ +<screen><userinput remap="configure">CC=$LFS_TGT-gcc \ +AR=$LFS_TGT-ar \ +RANLIB=$LFS_TGT-ranlib \ +../binutils-&binutils-version;/configure \ + --prefix=/tools \ + --disable-nls \ --with-lib-path=/tools/lib \ --with-sysroot</userinput></screen> diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index cd7c4e0ba..23c7fe7e8 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -113,28 +113,28 @@ cd ../gcc-build</userinput></screen> <para>Prepare GCC for compilation:</para> -<screen><userinput remap="configure">../gcc-&gcc-version;/configure \ - --target=$LFS_TGT \ - --prefix=/tools \ - --with-sysroot=$LFS \ - --with-newlib \ - --without-headers \ - --with-local-prefix=/tools \ - --with-native-system-header-dir=/tools/include \ - --disable-nls \ - --disable-shared \ - --disable-multilib \ - --disable-decimal-float \ - --disable-threads \ - --disable-libatomic \ - --disable-libgomp \ - --disable-libitm \ - --disable-libmudflap \ - --disable-libquadmath \ - --disable-libsanitizer \ - --disable-libssp \ - --disable-libstdc++-v3 \ - --enable-languages=c,c++ \ +<screen><userinput remap="configure">../gcc-&gcc-version;/configure \ + --target=$LFS_TGT \ + --prefix=/tools \ + --with-sysroot=$LFS \ + --with-newlib \ + --without-headers \ + --with-local-prefix=/tools \ + --with-native-system-header-dir=/tools/include \ + --disable-nls \ + --disable-shared \ + --disable-multilib \ + --disable-decimal-float \ + --disable-threads \ + --disable-libatomic \ + --disable-libgomp \ + --disable-libitm \ + --disable-libmudflap \ + --disable-libquadmath \ + --disable-libsanitizer \ + --disable-libssp \ + --disable-libstdc++-v3 \ + --enable-languages=c,c++ \ --with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \ --with-mpfr-lib=$(pwd)/mpfr/src/.libs</userinput></screen> diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index 60c9f467d..a370daf71 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -107,23 +107,24 @@ cd ../gcc-build</userinput></screen> <para>Now prepare GCC for compilation:</para> -<screen><userinput remap="configure">CC=$LFS_TGT-gcc \ -CXX=$LFS_TGT-g++ \ -AR=$LFS_TGT-ar \ -RANLIB=$LFS_TGT-ranlib \ -../gcc-&gcc-version;/configure \ - --prefix=/tools \ - --with-local-prefix=/tools \ - --with-native-system-header-dir=/tools/include \ - --enable-clocale=gnu \ - --enable-shared \ - --enable-threads=posix \ - --enable-__cxa_atexit \ - --enable-languages=c,c++ \ - --disable-libstdcxx-pch \ - --disable-multilib \ - --disable-bootstrap \ - --disable-libgomp \ +<screen><userinput remap="configure"> +CC=$LFS_TGT-gcc \ +CXX=$LFS_TGT-g++ \ +AR=$LFS_TGT-ar \ +RANLIB=$LFS_TGT-ranlib \ +../gcc-&gcc-version;/configure \ + --prefix=/tools \ + --with-local-prefix=/tools \ + --with-native-system-header-dir=/tools/include \ + --enable-clocale=gnu \ + --enable-shared \ + --enable-threads=posix \ + --enable-__cxa_atexit \ + --enable-languages=c,c++ \ + --disable-libstdcxx-pch \ + --disable-multilib \ + --disable-bootstrap \ + --disable-libgomp \ --with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \ --with-mpfr-lib=$(pwd)/mpfr/src/.libs</userinput></screen> diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 642532c87..b774e2d03 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -76,14 +76,14 @@ esac</userinput></screen> <para>Next, prepare Glibc for compilation:</para> <screen><userinput remap="configure">../glibc-&glibc-version;/configure \ - --prefix=/tools \ - --host=$LFS_TGT \ + --prefix=/tools \ + --host=$LFS_TGT \ --build=$(../glibc-&glibc-version;/scripts/config.guess) \ - --disable-profile \ - --enable-kernel=2.6.25 \ - --with-headers=/tools/include \ - libc_cv_forced_unwind=yes \ - libc_cv_ctors_header=yes \ + --disable-profile \ + --enable-kernel=2.6.25 \ + --with-headers=/tools/include \ + libc_cv_forced_unwind=yes \ + libc_cv_ctors_header=yes \ libc_cv_c_cleanup=yes</userinput></screen> <variablelist> diff --git a/chapter06/adjusting.xml b/chapter06/adjusting.xml index 1a58b1dbb..48057ee6c 100644 --- a/chapter06/adjusting.xml +++ b/chapter06/adjusting.xml @@ -30,9 +30,9 @@ ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen> so that GCC knows where to find the correct headers and Glibc start files. A <command>sed</command> command accomplishes this:</para> -<screen><userinput>gcc -dumpspecs | sed -e 's@/tools@@g' \ +<screen><userinput>gcc -dumpspecs | sed -e 's@/tools@@g' \ -e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \ - -e '/\*cpp:/{n;s@$@ -isystem /usr/include@}' > \ + -e '/\*cpp:/{n;s@$@ -isystem /usr/include@}' & \ `dirname $(gcc --print-libgcc-file-name)`/specs</userinput></screen> <para>It is a good idea to visually inspect the specs file to verify the diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 449f3a76a..b3fb46f2e 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -69,7 +69,7 @@ cd ../glibc-build</userinput></screen> <para>Prepare Glibc for compilation:</para> -<screen><userinput remap="configure">../glibc-&glibc-version;/configure \ +<screen><userinput remap="configure">../glibc-&glibc-version;/configure \ --prefix=/usr \ --disable-profile \ --enable-kernel=2.6.25 \ |