aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05
diff options
context:
space:
mode:
Diffstat (limited to 'chapter05')
-rw-r--r--chapter05/binutils-pass1.xml7
-rw-r--r--chapter05/binutils-pass2.xml9
-rw-r--r--chapter05/gcc-pass1.xml28
-rw-r--r--chapter05/gcc-pass2.xml24
-rw-r--r--chapter05/glibc.xml15
-rw-r--r--chapter05/grep.xml3
6 files changed, 55 insertions, 31 deletions
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index ca8e5b8f7..9c9f6225f 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -72,9 +72,10 @@ cd ../binutils-build</userinput></screen>
<para>Now prepare Binutils for compilation:</para>
-<screen><userinput remap="configure">../binutils-&binutils-version;/configure \
- --target=$LFS_TGT --prefix=/tools \
- --disable-nls --disable-werror</userinput></screen>
+<screen><userinput remap="configure">../binutils-&binutils-version;/configure --target=$LFS_TGT \
+ --prefix=/tools \
+ --disable-nls \
+ --disable-werror</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index f3fe914bb..03e55ca1e 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -51,9 +51,12 @@ cd ../binutils-build</userinput></screen>
<para>Prepare Binutils for compilation:</para>
<screen><userinput remap="configure">CC="$LFS_TGT-gcc -B/tools/lib/" \
- AR=$LFS_TGT-ar RANLIB=$LFS_TGT-ranlib \
- ../binutils-&binutils-version;/configure --prefix=/tools \
- --disable-nls --with-lib-path=/tools/lib</userinput></screen>
+AR=$LFS_TGT-ar \
+RANLIB=$LFS_TGT-ranlib \
+../binutils-&binutils-version;/configure \
+ --prefix=/tools \
+ --disable-nls \
+ --with-lib-path=/tools/lib</userinput></screen>
<variablelist>
<title>The meaning of the new configure options:</title>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 31703a184..d3efd71d6 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -76,14 +76,23 @@ cd ../gcc-build</userinput></screen>
<para>Prepare GCC for compilation:</para>
-<screen><userinput remap="configure">../gcc-&gcc-version;/configure \
- --target=$LFS_TGT --prefix=/tools \
- --disable-nls --disable-shared --disable-multilib \
- --disable-decimal-float --disable-threads \
- --disable-libmudflap --disable-libssp \
- --disable-libgomp --disable-libquadmath \
- --disable-target-libiberty --disable-target-zlib \
- --enable-languages=c --without-ppl --without-cloog \
+<screen><userinput remap="configure">../gcc-&gcc-version;/configure \
+ --target=$LFS_TGT \
+ --prefix=/tools \
+ --disable-nls \
+ --disable-shared \
+ --disable-multilib \
+ --disable-decimal-float \
+ --disable-threads \
+ --disable-libmudflap \
+ --disable-libssp \
+ --disable-libgomp \
+ --disable-libquadmath \
+ --disable-target-libiberty \
+ --disable-target-zlib \
+ --enable-languages=c \
+ --without-ppl \
+ --without-cloog \
--with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \
--with-mpfr-lib=$(pwd)/mpfr/src/.libs</userinput></screen>
@@ -159,8 +168,7 @@ cd ../gcc-build</userinput></screen>
since that file will end up containing the objects normally contained in
<filename>libgcc_eh.a</filename>:</para>
-<screen><userinput remap="install">ln -vs libgcc.a `$LFS_TGT-gcc -print-libgcc-file-name | \
- sed 's/libgcc/&amp;_eh/'`</userinput></screen>
+<screen><userinput remap="install">ln -vs libgcc.a `$LFS_TGT-gcc -print-libgcc-file-name | sed 's/libgcc/&amp;_eh/'`</userinput></screen>
</sect2>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 6823aea83..98243d88b 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -150,14 +150,22 @@ cd ../gcc-build</userinput></screen>
<para>Now prepare GCC for compilation:</para>
<screen><userinput remap="configure">CC="$LFS_TGT-gcc -B/tools/lib/" \
- AR=$LFS_TGT-ar RANLIB=$LFS_TGT-ranlib \
- ../gcc-&gcc-version;/configure --prefix=/tools \
- --with-local-prefix=/tools --enable-clocale=gnu \
- --enable-shared --enable-threads=posix \
- --enable-__cxa_atexit --enable-languages=c,c++ \
- --disable-libstdcxx-pch --disable-multilib \
- --disable-bootstrap --disable-libgomp \
- --without-ppl --without-cloog \
+AR=$LFS_TGT-ar \
+RANLIB=$LFS_TGT-ranlib \
+../gcc-&gcc-version;/configure \
+ --prefix=/tools \
+ --with-local-prefix=/tools \
+ --enable-clocale=gnu \
+ --enable-shared \
+ --enable-threads=posix \
+ --enable-__cxa_atexit \
+ --enable-languages=c,c++ \
+ --disable-libstdcxx-pch \
+ --disable-multilib \
+ --disable-bootstrap \
+ --disable-libgomp \
+ --without-ppl \
+ --without-cloog \
--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 8fcd0a8b4..26db57d2d 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -74,11 +74,16 @@ esac</userinput></screen>
<para>Next, prepare Glibc for compilation:</para>
-<screen><userinput remap="configure">../glibc-&glibc-version;/configure --prefix=/tools \
- --host=$LFS_TGT --build=$(../glibc-&glibc-version;/scripts/config.guess) \
- --disable-profile --enable-add-ons \
- --enable-kernel=2.6.25 --with-headers=/tools/include \
- libc_cv_forced_unwind=yes libc_cv_c_cleanup=yes</userinput></screen>
+<screen><userinput remap="configure">../glibc-&glibc-version;/configure \
+ --prefix=/tools \
+ --host=$LFS_TGT \
+ --build=$(../glibc-&glibc-version;/scripts/config.guess) \
+ --disable-profile \
+ --enable-add-ons \
+ --enable-kernel=2.6.25 \
+ --with-headers=/tools/include \
+ libc_cv_forced_unwind=yes \
+ libc_cv_c_cleanup=yes</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
diff --git a/chapter05/grep.xml b/chapter05/grep.xml
index fcfec08f9..2cfe6127e 100644
--- a/chapter05/grep.xml
+++ b/chapter05/grep.xml
@@ -45,8 +45,7 @@
<para>Prepare Grep for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/tools \
- --disable-perl-regexp</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/tools --disable-perl-regexp</userinput></screen>
<variablelist>
<title>The meaning of the configure switches:</title>