Changes in / [d7c5e6c:32f686f]

Files:

• chapter03/packages.xml (modified) (2 diffs)
• chapter06/rustc.xml (modified) (2 diffs)
• packages.ent (modified) (1 diff)

chapter03/packages.xml

@@ -479 +479 @@
 
     <varlistentry>
+      <term>LLVM-cmake Modules (&llvm-cmake-version;) - <token>&llvm-cmake-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&llvm-cmake-home;"/></para>
+        <para>Download: <ulink url="&llvm-cmake-url;"/></para>
+        <para>MD5 sum: <literal>&llvm-cmake-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>LLVM (&llvm-version;) - <token>&llvm-size;</token>:</term>
       <listitem>
@@ -484 +493 @@
         <para>Download: <ulink url="&llvm-url;"/></para>
         <para>MD5 sum: <literal>&llvm-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>LLVM CMake Modules (&llvm-version;) - <token>&llvm-cmake-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&llvm-home;"/></para>
-        <para>Download: <ulink url="&llvm-cmake-url;"/></para>
-        <para>MD5 sum: <literal>&llvm-cmake-md5;</literal></para>
       </listitem>
     </varlistentry>

chapter06/rustc.xml

@@ -54 +54 @@
 
     <para>In the first pass, build Rustc as a cross compiler for
-    <envar>$LFS_TGT</envar>.  The cross compiler will link to LLVM Pass 1,
-    so we need to tell the dynamic linker of the host distro where to find
-    the LLVM Pass 1 dynamic library:</para>
-
-<screen><userinput remap="pre">export LD_LIBRARY_PATH=$LFS/tools/lib</userinput></screen>
-
-    <para>Create a suitable configuration:</para>
+    <envar>$LFS_TGT</envar>.  Create a suitable configuration:</para>
 
 <screen><userinput remap="pre">install -vm755 src/llvm-project/llvm/cmake/config.guess config.guess
@@ -170 +164 @@
 ln -sv rustc-&rustc-version; $LFS/opt/rustc</userinput></screen>
 
-    <!-- Maybe we should just set LD_LIBRARY_PATH=$LFS/tools
-         during the entire chapter 5 and 6.  But doing so will need to
-         modify .bashrc of lfs user.  For now just unset it, so the manual
-         build is consistent with jhalfs.  -->
-    <para>Clean up the environment:</para>
-
-<screen><userinput remap="make">unset LD_LIBRARY_PATH</userinput></screen>
-
   </sect2>
 

packages.ent

@@ -467 +467 @@
 <!ENTITY llvm-final-du "3,800 MB">
 
-<!-- TODO: if we merge Rust into trunk, create a symlink on anduin and
-           use &anduin-sources; instead -->
-<!ENTITY llvm-cmake-url "https://anduin.linuxfromscratch.org/BLFS/llvm/llvm-cmake-15.0.1.src.tar.xz">
-<!ENTITY llvm-cmake-md5 "8b768b6128baf4e6797ae54a10bc0ed2">
-<!ENTITY llvm-cmake-size "8 KB">
-
 <!ENTITY m4-version "1.4.19">
 <!ENTITY m4-size "1,617 KB">