Changeset 5f18bea in clfs-embedded for BOOK/cross-tools/common

Timestamp:

Oct 15, 2013, 8:30:49 PM (11 years ago)

Author:

Andrew Bradford <andrew@…>

Branches:

master

Children:

94e2400

Parents:

113a63a

Message:

gcc: Add --with-mpfr directives to configure

Such that in-tree mpfr can be found. Without, will search the host and
that would potentially defeat the purpose of putting mpfr in the gcc
tree.

Location:

BOOK/cross-tools/common

Files:

• gcc-final.xml (modified) (1 diff)
• gcc-static.xml (modified) (2 diffs)

BOOK/cross-tools/common/gcc-final.xml

@@ -73 +73 @@
   --with-gmp=${CLFS}/cross-tools \
   --with-mpc=${CLFS}/cross-tools \
-  --disable-multilib</userinput></screen>
+  --disable-multilib \
+  --with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \
+  --with-mpfr-lib=$(pwd)/mpfr/src/.libs</userinput></screen>
 
     <variablelist os="af">

BOOK/cross-tools/common/gcc-static.xml

@@ -73 +73 @@
   --disable-threads \
   --enable-languages=c \
-  --disable-multilib</userinput></screen>
+  --disable-multilib \
+  --with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \
+  --with-mpfr-lib=$(pwd)/mpfr/src/.libs</userinput></screen>
 
     <variablelist os="af">
@@ -220 +222 @@
       </varlistentry>
 
-    <varlistentry os="af21">
-      <term><parameter>--disable-multilib</parameter></term>
-      <listitem>
-        <para>This option specifies that multiple target libraries should
-        not be built.</para>
-      </listitem>
-    </varlistentry>
+      <varlistentry os="af21">
+        <term><parameter>--disable-multilib</parameter></term>
+        <listitem>
+          <para>This option specifies that multiple target libraries should
+          not be built.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry os="af22">
+        <term><parameter>--with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src</parameter></term>
+        <listitem>
+          <para>Tells configure how to find the mpfr headers.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry os="af23">
+        <term><parameter>--with-mpfr-lib=$(pwd)/mpfr/src/.libs</parameter></term>
+        <listitem>
+          <para>Tells configure to use the mpfr libraries built within the GCC
+            build directory.  This happens automatically but is needed to
+            prevent GCC from searching the host's normal library paths.</para>
+        </listitem>
+      </varlistentry>
 
     </variablelist>