commit b3aa91b9d9df841aa0ee68ede13af10657550ece · pyrox.dev/nixpkgs

+22 -3
pkgs/development/compilers/mrustc/bootstrap.nix
···

       4
       4
        
         fetchurl,

     

       5
       5
        
         mrustc,

     

       6
       6
        
         mrustc-minicargo,

     

       7
       7
       -
         llvm_12,

     

       7
       7
       +
         #llvm_12,

     

       8
       8
        
         libffi,

     

       9
       9
        
         cmake,

     

       10
       10
        
         perl,

     
···

       64
       64
        
         ];

     

       65
       65
        
         buildInputs = [

     

       66
       66
        
           # for rustc

     

       67
       67
       -
           llvm_12

     

       67
       67
       +
           #llvm_12

     

       68
       68
        
           libffi

     

       69
       69
        
           zlib

     

       70
       70
        
           libxml2

     
···

       76
       76
        
           # Use shared mrustc/minicargo/llvm instead of rebuilding them

     

       77
       77
        
           "MRUSTC=${mrustc}/bin/mrustc"

     

       78
       78
        
           #"MINICARGO=${mrustc-minicargo}/bin/minicargo"  # FIXME: we need to rebuild minicargo locally so --manifest-overrides is applied

     

       79
       79
       -
           "LLVM_CONFIG=${llvm_12.dev}/bin/llvm-config"

     

       79
       79
       +
           #"LLVM_CONFIG=${llvm_12.dev}/bin/llvm-config"

     

       80
       80
        
           "RUSTC_TARGET=${stdenv.targetPlatform.rust.rustcTarget}"

     

       81
       81
        
         ];

     

       82
       82
        
       

     
···

       153
       153
        
             asl20

     

       154
       154
        
           ];

     

       155
       155
        
           platforms = [ "x86_64-linux" ];

     

       156
       156
       +
           # rustc 1.54 only supports LLVM 12, which was removed from Nixpkgs.

     

       157
       157
       +
           # mrustc can bootstrap up to rustc 1.74, which supported LLVM 17,

     

       158
       158
       +
           # which has also been removed.

     

       159
       159
       +
           #

     

       160
       160
       +
           # 1.74 also shipped with the Cranelift backend, so perhaps that

     

       161
       161
       +
           # could be used instead? Alternatively, it may be possible to

     

       162
       162
       +
           # backport the upstream patches to support LLVM 18 to 1.74.

     

       163
       163
       +
           # Assuming LLVM 18 is still in Nixpkgs by the time you read this

     

       164
       164
       +
           # comment, anyway. But if not, then maybe mrustc has been updated

     

       165
       165
       +
           # to support newer rustc versions? Hope springs eternal.

     

       166
       166
       +
           #

     

       167
       167
       +
           # (Note that you still have to “draw the rest of the owl” to

     

       168
       168
       +
           # bootstrap the chain of rustc versions between this bootstrap

     

       169
       169
       +
           # and the version currently used in Nixpkgs, anyway, so this was

     

       170
       170
       +
           # already not useful for bootstrapping a Rust compiler for use with

     

       171
       171
       +
           # Nixpkgs without a lot of additional work. See Guix’s Rust

     

       172
       172
       +
           # bootstrap chain, or the non‐Rust minimal bootstrap in Guix and

     

       173
       173
       +
           # Nixpkgs, for inspiration.)

     

       174
       174
       +
           broken = true;

     

       156
       175
        
         };

     

       157
       176
        
       }