diff options
| author | Francesco Gazzetta <fgaz@fgaz.me> | 2023-06-07 11:06:05 +0200 |
|---|---|---|
| committer | Francesco Gazzetta <fgaz@fgaz.me> | 2023-06-07 11:06:13 +0200 |
| commit | 131808261a30a2dd9742098a2a5d864dbc70cfc5 (patch) | |
| tree | 9ade73a338b3cded0f321c3ee8f304e2df94cc82 /pkgs/development/compilers/rust | |
| parent | 03925ecb5febe87eff4e00b32a66b5cd9a9820ac (diff) | |
| download | nixlib-131808261a30a2dd9742098a2a5d864dbc70cfc5.tar nixlib-131808261a30a2dd9742098a2a5d864dbc70cfc5.tar.gz nixlib-131808261a30a2dd9742098a2a5d864dbc70cfc5.tar.bz2 nixlib-131808261a30a2dd9742098a2a5d864dbc70cfc5.tar.lz nixlib-131808261a30a2dd9742098a2a5d864dbc70cfc5.tar.xz nixlib-131808261a30a2dd9742098a2a5d864dbc70cfc5.tar.zst nixlib-131808261a30a2dd9742098a2a5d864dbc70cfc5.zip | |
rustc: use llvm_16
https://github.com/rust-lang/rust/releases/tag/1.70.0 (Internal Changes) https://github.com/rust-lang/rust/pull/109474/
Diffstat (limited to 'pkgs/development/compilers/rust')
| -rw-r--r-- | pkgs/development/compilers/rust/1_70.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/compilers/rust/1_70.nix b/pkgs/development/compilers/rust/1_70.nix index 9025adacfe74..8c91ed01009d 100644 --- a/pkgs/development/compilers/rust/1_70.nix +++ b/pkgs/development/compilers/rust/1_70.nix @@ -16,24 +16,24 @@ , pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost , makeRustPlatform , llvmPackages_11 -, llvmPackages_15, llvm_15 +, llvmPackages_16, llvm_16 } @ args: import ./default.nix { rustcVersion = "1.70.0"; rustcSha256 = "sha256-sr+uAAt6UEDk7Eu8UKCfIVSBkMt1cLDtdzWDaEE70nw="; - llvmSharedForBuild = pkgsBuildBuild.llvmPackages_15.libllvm.override { enableSharedLibraries = true; }; - llvmSharedForHost = pkgsBuildHost.llvmPackages_15.libllvm.override { enableSharedLibraries = true; }; - llvmSharedForTarget = pkgsBuildTarget.llvmPackages_15.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForBuild = pkgsBuildBuild.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; llvmBootstrapForDarwin = llvmPackages_11; # For use at runtime - llvmShared = llvm_15.override { enableSharedLibraries = true; }; + llvmShared = llvm_16.override { enableSharedLibraries = true; }; # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox - llvmPackages = llvmPackages_15; + llvmPackages = llvmPackages_16; # Note: the version MUST be one version prior to the version we're # building @@ -60,4 +60,4 @@ import ./default.nix { rustcPatches = [ ]; } -(builtins.removeAttrs args [ "pkgsBuildHost" "llvmPackages_11" "llvmPackages_15" "llvm_15"]) +(builtins.removeAttrs args [ "pkgsBuildHost" "llvmPackages_11" "llvmPackages_16" "llvm_16"]) |