Changeset 8cb68bb1

Timestamp:

03/28/2020 02:22:34 AM (4 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

7dc165a5

Parents:

44326560

Message:

Use the shipped version of llvm in rustc-1.39.0 becasue system llvm 10.0 does not build it.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@22907 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/prog/rust.xml (modified) (4 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general/prog/rust.xml

@@ -12 +12 @@
        install, i.e. the source with its DESTDIR *plus* the DESTDIR.  You
        can 'mkdir /tmp/RUST ; cp -a install/* /tmp/RUST' and then run 'du -sch'
-       to measure it. -->
-
-  <!ENTITY rust-buildsize     "7.7 GB (607 MB installed) including 398 MB of ~/.cargo files for the user building this. Add 2.1 GB if running the tests">
-  <!ENTITY rust-time          "24 SBU (add 12 SBU for tests, both on a 4-core machine)">
+       to measure it, or du -sm to look at the size of the build tree before and
+       after the tests. -->
+
+  <!ENTITY rust-buildsize     "9.0 GB (747 MB installed) including 344 MB of ~/.cargo files for the user building this. Add 2.3 GB if running the tests">
+  <!ENTITY rust-time          "52 SBU (add 15 SBU for tests, both on a 4-core machine)">
 ]>
 
@@ -187 +188 @@
     </para>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
+<!--<bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <package>clang</package> from <xref linkend="llvm"/>
       (built with -DLLVM_LINK_LLVM_DYLIB=ON so that rust can link to
       system LLVM instead of building its shipped version)
-    </para>
+    </para> FIXME reinstate when next using system llvm -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -236 +237 @@
 <screen><userinput>cat &lt;&lt; EOF &gt; config.toml
 <literal># see config.toml.example for more possible options
-# See the 8.4 book for an example using shipped LLVM
-# e.g. if not installing clang, or using a version before 8.0.
+# See the 9.1 book for an example using system LLVM
+# e.g. if you are still using llvm-9.0.1
 [llvm]
 # by default, rust will build for a myriad of architectures
 targets = "X86"
 
-# When using system llvm prefer shared libraries
-link-shared = true
-
 [build]
 # omit docs to save time and space (default is to build them)
@@ -263 +261 @@
 # so disable codegen tests
 codegen-tests = false
-
-[target.x86_64-unknown-linux-gnu]
-# NB the output of llvm-config (i.e. help options) may be
-# dumped to the screen when config.toml is parsed.
-llvm-config = "/usr/bin/llvm-config"
-
-[target.i686-unknown-linux-gnu]
-# NB the output of llvm-config (i.e. help options) may be
-# dumped to the screen when config.toml is parsed.
-llvm-config = "/usr/bin/llvm-config"
 
 </literal>

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[ken] - Use the shipped copy of llvm when building rustc-1.39.0,
+          instead of system llvm because it fails to build with llvm-10.0.. Fixes
+          <ulink url="&blfs-ticket-root;13320">#13320</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[renodr] - Update to glib-networking-2.64.1. Fixes
           <ulink url="&blfs-ticket-root;13323">#13323</ulink>.</para>