From 9bbba5cb8ec818927bc502d02a6901b587d2c707 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 27 Feb 2022 18:47:36 +0100 Subject: [PATCH] llvmPackages_14: init at 2022-01-07 This is a temporary hack until I have time to update the patches for 14.0.0-rc1. We need llvmPackages_14 *NOW* for Chromium M99. (cherry picked from commit d61e45b686bba959ae361425a47a881a43a56fad) --- pkgs/development/compilers/llvm/14/default.nix | 2 +- pkgs/top-level/all-packages.nix | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index 0f45acffb279..7bf9127c67cf 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -19,7 +19,7 @@ let release_version = "14.0.0"; - candidate = ""; # empty or "rcN" + candidate = "rc0"; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; rev = "fb1582f6c54422995c6fb61ba4c55126b357f64e"; # When using a Git commit rev-version = "unstable-2022-01-07"; # When using a Git commit diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8f66b70d6b8..e4f3ed8d2f34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11485,6 +11485,7 @@ with pkgs; }; }; + clang_14 = llvmPackages_14.clang; clang_13 = llvmPackages_13.clang; clang_12 = llvmPackages_12.clang; clang_11 = llvmPackages_11.clang; @@ -12481,6 +12482,7 @@ with pkgs; lld_11 = llvmPackages_11.lld; lld_12 = llvmPackages_12.lld; lld_13 = llvmPackages_13.lld; + lld_14 = llvmPackages_14.lld; lldb = llvmPackages_latest.lldb; lldb_5 = llvmPackages_5.lldb; @@ -12492,11 +12494,13 @@ with pkgs; lldb_11 = llvmPackages_11.lldb; lldb_12 = llvmPackages_12.lldb; lldb_13 = llvmPackages_13.lldb; + lldb_14 = llvmPackages_14.lldb; llvm = llvmPackages.llvm; libllvm = llvmPackages.libllvm; llvm-manpages = llvmPackages.llvm-manpages; + llvm_14 = llvmPackages_14.llvm; llvm_13 = llvmPackages_13.llvm; llvm_12 = llvmPackages_12.llvm; llvm_11 = llvmPackages_11.llvm; @@ -12591,6 +12595,14 @@ with pkgs; inherit (llvmPackages_11) stdenv; })); + llvmPackages_14 = recurseIntoAttrs (callPackage ../development/compilers/llvm/14 ({ + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages.llvmPackages_14.tools; + targetLlvmLibraries = targetPackages.llvmPackages_14.libraries or llvmPackages_14.libraries; + } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { + stdenv = gcc7Stdenv; + })); + llvmPackages_latest = llvmPackages_13; llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { });