Changeset 8cb68bb1


Ignore:
Timestamp:
03/28/2020 02:22:34 AM (3 years ago)
Author:
Ken Moffat <ken@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, lazarus, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226
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:
2 edited

Legend:

Unmodified
Added
Removed
  • general/prog/rust.xml

    r44326560 r8cb68bb1  
    1212       install, i.e. the source with its DESTDIR *plus* the DESTDIR.  You
    1313       can 'mkdir /tmp/RUST ; cp -a install/* /tmp/RUST' and then run 'du -sch'
    14        to measure it. -->
    15 
    16   <!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">
    17   <!ENTITY rust-time          "24 SBU (add 12 SBU for tests, both on a 4-core machine)">
     14       to measure it, or du -sm to look at the size of the build tree before and
     15       after the tests. -->
     16
     17  <!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">
     18  <!ENTITY rust-time          "52 SBU (add 15 SBU for tests, both on a 4-core machine)">
    1819]>
    1920
     
    187188    </para>
    188189
    189     <bridgehead renderas="sect4">Recommended</bridgehead>
     190<!--<bridgehead renderas="sect4">Recommended</bridgehead>
    190191    <para role="recommended">
    191192      <package>clang</package> from <xref linkend="llvm"/>
    192193      (built with -DLLVM_LINK_LLVM_DYLIB=ON so that rust can link to
    193194      system LLVM instead of building its shipped version)
    194     </para>
     195    </para> FIXME reinstate when next using system llvm -->
    195196
    196197    <bridgehead renderas="sect4">Optional</bridgehead>
     
    236237<screen><userinput>cat &lt;&lt; EOF &gt; config.toml
    237238<literal># see config.toml.example for more possible options
    238 # See the 8.4 book for an example using shipped LLVM
    239 # e.g. if not installing clang, or using a version before 8.0.
     239# See the 9.1 book for an example using system LLVM
     240# e.g. if you are still using llvm-9.0.1
    240241[llvm]
    241242# by default, rust will build for a myriad of architectures
    242243targets = "X86"
    243244
    244 # When using system llvm prefer shared libraries
    245 link-shared = true
    246 
    247245[build]
    248246# omit docs to save time and space (default is to build them)
     
    263261# so disable codegen tests
    264262codegen-tests = false
    265 
    266 [target.x86_64-unknown-linux-gnu]
    267 # NB the output of llvm-config (i.e. help options) may be
    268 # dumped to the screen when config.toml is parsed.
    269 llvm-config = "/usr/bin/llvm-config"
    270 
    271 [target.i686-unknown-linux-gnu]
    272 # NB the output of llvm-config (i.e. help options) may be
    273 # dumped to the screen when config.toml is parsed.
    274 llvm-config = "/usr/bin/llvm-config"
    275263
    276264</literal>
  • introduction/welcome/changelog.xml

    r44326560 r8cb68bb1  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[ken] - Use the shipped copy of llvm when building rustc-1.39.0,
     49          instead of system llvm because it fails to build with llvm-10.0.. Fixes
     50          <ulink url="&blfs-ticket-root;13320">#13320</ulink>.</para>
     51        </listitem>
     52        <listitem>
    4853          <para>[renodr] - Update to glib-networking-2.64.1. Fixes
    4954          <ulink url="&blfs-ticket-root;13323">#13323</ulink>.</para>
Note: See TracChangeset for help on using the changeset viewer.