alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

rustc: Expose llvmPackages set used to build rustc

Browse source 
Reusing the same llvmPackages version used for building rustc is
required for LTO in Firefox.
This commit is contained in:
Martin Weinelt 2021-11-02 17:34:05 +01:00
parent 3f9b49e0ec
commit c28e3f9d00
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/compilers/rust/1_55.nix
View file

@ -32,6 +32,9 @@ import ./default.nix {
# For use at runtime
llvmShared = llvm_12.override { enableSharedLibraries = true; };
# Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox
llvmPackagesForBuild = pkgsBuildBuild.llvmPackages_12;
# Note: the version MUST be one version prior to the version we're
# building
bootstrapVersion = "1.54.0";

3
pkgs/development/compilers/rust/default.nix
View file

@ -10,6 +10,7 @@
, llvmSharedForBuild
, llvmSharedForHost
, llvmSharedForTarget
, llvmPackagesForBuild # Exposed through rustc for LTO in Firefox
}:
{ stdenv, lib
, buildPackages
@ -85,7 +86,7 @@
version = rustcVersion;
sha256 = rustcSha256;
inherit enableRustcDev;
inherit llvmShared llvmSharedForBuild llvmSharedForHost llvmSharedForTarget;
inherit llvmShared llvmSharedForBuild llvmSharedForHost llvmSharedForTarget llvmPackagesForBuild;
patches = rustcPatches;

7
pkgs/development/compilers/rust/rustc.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
, llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget
, llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackagesForBuild
, fetchurl, file, python3
, darwin, cmake, rust, rustPlatform
, pkg-config, openssl
@ -174,7 +174,10 @@ in stdenv.mkDerivation rec {
requiredSystemFeatures = [ "big-parallel" ];
passthru.llvm = llvmShared;
passthru = {
llvm = llvmShared;
llvmPackages = llvmPackagesForBuild;
};
meta = with lib; {
homepage = "https://www.rust-lang.org/";