aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/gcc-exp.xml19
-rw-r--r--chapter06/gcc-inst.xml74
-rw-r--r--chapter06/gcc.xml5
3 files changed, 63 insertions, 35 deletions
diff --git a/chapter06/gcc-exp.xml b/chapter06/gcc-exp.xml
deleted file mode 100644
index 42f3430ac..000000000
--- a/chapter06/gcc-exp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>--enable-threads=posix:</userinput> This enables C++
-exception handling for multi-threaded code.</para>
-
-<para><userinput>--enable-__cxa_atexit:</userinput> This option will result
-in C++ shared libraries and C++ programs that are interoperable with other
-Linux distributions.</para>
-
-<para><userinput>--enable-clocale=gnu:</userinput> There is a risk that
-some people will build ABI incompatible C++ libraries if they didn't install
-all of the glibc localedata. Using --enable-clocale=gnu ensures that the
-"right thing" is done in all cases. If you don't wish to use this option,
-then at least build the <emphasis>de_DE</emphasis> locale. When GCC finds
-this specific locale, then the correct locale mode (<emphasis>gnu</emphasis>)
-is implemented.</para>
-
-</sect2>
diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml
index b4cf8d809..9c6f3aa62 100644
--- a/chapter06/gcc-inst.xml
+++ b/chapter06/gcc-inst.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2>
<title>Installation of GCC</title>
@@ -8,21 +10,67 @@ that override default optimizations, such as CFLAGS and CXXFLAGS, we
recommend unsetting or modifying them when building GCC. You have
been warned.</para>
-<para>Install GCC by running the following commands. These commands will
-build the C and C++ compilers, so you'll need to unpack both the gcc-core
-and gcc-g++ tarballs. Other compilers are available in the full gcc package;
-instructions for building them may be found at
-<ulink url="&blfs-root;view/cvs/general/gcc.html"/>.</para>
+<para>We will be building the C and C++ compilers at this time, so you'll
+need to unpack both the gcc-core and gcc-g++ tarballs. Other compilers are
+available in the full gcc package; instructions for building them may be
+found at <ulink url="&blfs-root;view/cvs/general/gcc.html"/>.</para>
+
+<para>It is recommended by the GCC installation documentation to build GCC
+in a dedicated directory outside of the source tree. Create the build
+directory:</para>
<para><screen><userinput>mkdir ../gcc-build &amp;&amp;
-cd ../gcc-build &amp;&amp;
-../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \
+cd ../gcc-build</userinput></screen></para>
+
+<para>Prepare GCC to be compiled:</para>
+
+<para><screen><userinput>../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \
&nbsp;&nbsp;&nbsp;&nbsp;--enable-threads=posix --with-slibdir=/lib \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-__cxa_atexit --enable-clocale=gnu &amp;&amp;
-make bootstrap &amp;&amp;
-make install &amp;&amp;
-ln -s ../usr/bin/cpp /lib &amp;&amp;
-ln -s ../bin/cpp /usr/lib &amp;&amp;
-ln -s gcc /usr/bin/cc</userinput></screen></para>
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-__cxa_atexit --enable-clocale=gnu</userinput></screen></para>
+
+<para>The meanings of the configure options are:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--enable-threads=posix:</userinput> This enables
+C++ exception handling for multi-threaded code.</para></listitem>
+
+<listitem><para><userinput>--enable-__cxa_atexit:</userinput> This option
+will result in C++ shared libraries and C++ programs that are interoperable
+with other Linux distributions.</para></listitem>
+
+<listitem><para><userinput>--enable-clocale=gnu:</userinput> There is a risk
+that some people will build ABI incompatible C++ libraries if they didn't
+install all of the glibc localedata. Using --enable-clocale=gnu ensures that
+the "right thing" is done in all cases. If you don't wish to use this option,
+then at least build the <emphasis>de_DE</emphasis> locale. When GCC finds
+this specific locale, then the correct locale mode (<emphasis>gnu</emphasis>)
+is implemented.</para></listitem>
+</itemizedlist>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make bootstrap</userinput></screen></para>
+
+<para>The <emphasis>bootstrap</emphasis> target doesn't just compile GCC, but
+it compiles GCC a multiple times. It uses the first compiled programs to
+compile itself a second and third time to make sure the compiler was compiled
+properly.</para>
+
+<para>Finish installing the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
+
+<para>Some packages require that the C++ compiler be installed in the
+<filename>/lib</filename> and <filename>/usr/lib</filename> directories.
+To honor those packages, create two symlinks:</para>
+
+<para><screen><userinput>ln -s ../usr/bin/cpp /lib &amp;&amp;
+ln -s ../bin/cpp /usr/lib</userinput></screen></para>
+
+<para>Many packages compile using <emphasis>cc</emphasis> as the name for
+the C compiler. To satisfy those packages, create a <emphasis>cc</emphasis>
+symlink:</para>
+
+<para><screen><userinput>ln -s gcc /usr/bin/cc</userinput></screen></para>
</sect2>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index a58451300..dd141c817 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -5,10 +5,9 @@
<screen>Estimated build time: &gcc-time;
Estimated required disk space: &gcc-compsize;</screen>
-&c6-gcc-inst;
-&c6-gcc-exp;
-&aa-gcc-desc;
+&aa-gcc-shortdesc;
&aa-gcc-dep;
+&c6-gcc-inst;
</sect1>