From 25771c306328211c2925f6924d849b7346f28cd0 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Sat, 4 Jul 2020 21:14:57 +0000
Subject: Various clean up: - prevent static python libraries to be installed
 in chapter 7 since it   is not overwrittent in chapter 8 - have
 libstdc++-pass2 install its host specific headers into a host   specific
 directory - clean the temporary compiler and the cros compiler at the end of
 chapter 8

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11992 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter07/libstdc++-pass2.xml | 20 +++++++++++++++-----
 chapter07/python.xml          | 11 ++++++++++-
 2 files changed, 25 insertions(+), 6 deletions(-)

(limited to 'chapter07')

diff --git a/chapter07/libstdc++-pass2.xml b/chapter07/libstdc++-pass2.xml
index 015d8d8ea..35b5a8baf 100644
--- a/chapter07/libstdc++-pass2.xml
+++ b/chapter07/libstdc++-pass2.xml
@@ -62,11 +62,12 @@ cd       build</userinput></screen>
 
     <para>Prepare libstdc++ for compilation:</para>
 
-<screen><userinput remap="configure">../libstdc++-v3/configure           \
-    CXXFLAGS="-g -O2 -D_GNU_SOURCE" \
-    --prefix=/usr                   \
-    --disable-multilib              \
-    --disable-nls                   \
+<screen><userinput remap="configure">../libstdc++-v3/configure            \
+    CXXFLAGS="-g -O2 -D_GNU_SOURCE"  \
+    --prefix=/usr                    \
+    --disable-multilib               \
+    --disable-nls                    \
+    --host=$(uname -m)-lfs-linux-gnu \
     --disable-libstdcxx-pch</userinput></screen>
 
     <variablelist>
@@ -80,6 +81,15 @@ cd       build</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>--host=$(uname -m)-lfs-linux-gnu</parameter></term>
+        <listitem>
+          <para>We have to mimic what would happen if this package were built
+          as part of a full compiler build. This switch would be passed to
+          configure by GCC's build machinery.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><parameter>--disable-libstdcxx-pch</parameter></term>
         <listitem>
diff --git a/chapter07/python.xml b/chapter07/python.xml
index a3b9239cf..68a02dd8c 100644
--- a/chapter07/python.xml
+++ b/chapter07/python.xml
@@ -52,11 +52,20 @@
 
     <para>Prepare Python for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --without-ensurepip</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr   \
+            --enable-shared \
+            --without-ensurepip</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure option:</title>
 
+      <varlistentry>
+        <term><parameter>--enable-shared</parameter></term>
+        <listitem>
+          <para>This switch prevents installation of static libraries.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><parameter>--without-ensurepip</parameter></term>
         <listitem>
-- 
cgit v1.2.3-54-g00ecf