ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-16 01:19:22 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #333146 from ExpidusOS/feat/llvm-clean

Browse Source 
Minor LLVM improvements
This commit is contained in:
tomberek 2024-08-16 01:34:50 -04:00 committed by GitHub
commit 7248a7fde6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/llvm/common/default.nix
View File

@ -89,9 +89,7 @@ let
} }
); );
in in
{ lib.recurseIntoAttrs { llef = callPackage ./lldb-plugins/llef.nix { }; }
llef = callPackage ./lldb-plugins/llef.nix { };
}
); );
tools = lib.makeExtensible ( tools = lib.makeExtensible (

43
pkgs/development/compilers/llvm/default.nix
View File

@ -7,6 +7,7 @@
stdenv, stdenv,
gcc12Stdenv, gcc12Stdenv,
pkgs, pkgs,
recurseIntoAttrs,
# This is the default binutils, but with *this* version of LLD rather # This is the default binutils, but with *this* version of LLD rather
# than the default LLVM version's, if LLD is the choice. We use these for # than the default LLVM version's, if LLD is the choice. We use these for
# the `useLLVM` bootstrapping below. # the `useLLVM` bootstrapping below.
@ -51,27 +52,29 @@ let
args.name or (if (gitRelease != null) then "git" else lib.versions.major release_version); args.name or (if (gitRelease != null) then "git" else lib.versions.major release_version);
in in
lib.nameValuePair attrName ( lib.nameValuePair attrName (
callPackage ./common { recurseIntoAttrs (
inherit (stdenvAdapters) overrideCC; callPackage ./common {
buildLlvmTools = buildPackages."llvmPackages_${attrName}".tools; inherit (stdenvAdapters) overrideCC;
targetLlvmLibraries = buildLlvmTools = buildPackages."llvmPackages_${attrName}".tools;
targetPackages."llvmPackages_${attrName}".libraries or llvmPackages."${attrName}".libraries; targetLlvmLibraries =
targetLlvm = targetPackages."llvmPackages_${attrName}".llvm or llvmPackages."${attrName}".llvm; targetPackages."llvmPackages_${attrName}".libraries or llvmPackages."${attrName}".libraries;
stdenv = targetLlvm = targetPackages."llvmPackages_${attrName}".llvm or llvmPackages."${attrName}".llvm;
if (lib.versions.major release_version == "13" && stdenv.cc.cc.isGNU or false) then stdenv =
gcc12Stdenv if (lib.versions.major release_version == "13" && stdenv.cc.cc.isGNU or false) then
else gcc12Stdenv
stdenv; # does not build with gcc13 else
inherit bootBintoolsNoLibc bootBintools; stdenv; # does not build with gcc13
inherit inherit bootBintoolsNoLibc bootBintools;
officialRelease inherit
gitRelease officialRelease
monorepoSrc gitRelease
version monorepoSrc
; version
} ;
}
)
); );
llvmPackages = lib.mapAttrs' (version: args: mkPackage (args // { inherit version; })) versions; llvmPackages = lib.mapAttrs' (version: args: mkPackage (args // { inherit version; })) versions;
in in
llvmPackages llvmPackages // { inherit mkPackage; }

2
pkgs/top-level/aliases.nix
View File

@ -883,7 +883,7 @@ mapAliases ({
linuxPackages_testing_bcachefs = throw "'linuxPackages_testing_bcachefs' has been removed, please use 'linuxPackages_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; linuxPackages_testing_bcachefs = throw "'linuxPackages_testing_bcachefs' has been removed, please use 'linuxPackages_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support";
linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support";
llvmPackages_git = (recurseIntoAttrs (callPackages ../development/compilers/llvm { })).git; llvmPackages_git = (callPackages ../development/compilers/llvm { }).git;
lld_6 = throw "lld_6 has been removed from nixpkgs"; # Added 2024-01-08 lld_6 = throw "lld_6 has been removed from nixpkgs"; # Added 2024-01-08
lld_7 = throw "lld_7 has been removed from nixpkgs"; # Added 2023-11-19 lld_7 = throw "lld_7 has been removed from nixpkgs"; # Added 2023-11-19