nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

llvmPackages.tblgen: Fix 12/13/14 build (#366355)

Browse Source
This commit is contained in:
Philip Taron
2024-12-22 12:31:28 -08:00
committed by GitHub
parent c1c1156894 3fdf224de2
commit 87387bb46d
2 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -515,7 +515,17 @@ let
# we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
llvm = tools.libllvm;
tblgen = callPackage ./tblgen.nix { };
tblgen = callPackage ./tblgen.nix {
patches = builtins.filter
# Crude method to drop polly patches if present, they're not needed for tblgen.
(p: (!lib.hasInfix "-polly" p)) tools.libllvm.patches;
clangPatches = [
# Would take tools.libclang.patches, but this introduces a cycle due
# to replacements depending on the llvm outpath (e.g. the LLVMgold patch).
# So take the only patch known to be necessary.
(metadata.getVersionFile "clang/gnu-install-dirs.patch")
];
};
libclang = callPackage ./clang {
patches =

42
pkgs/development/compilers/llvm/common/tblgen.nix
View File

@@ -12,6 +12,7 @@
src ? null,
stdenv,
version,
clangPatches,
}:
let
@@ -60,6 +61,17 @@ let
src = src';
sourceRoot = "${src.name}/llvm";
postPatch = ''
(
cd ../clang
chmod u+rwX -R .
for p in ${toString clangPatches}
do
patch -p1 < $p
done
)
'';
nativeBuildInputs = [
cmake
ninja
@@ -69,12 +81,16 @@ let
cmakeFlags = [
# Projects with tablegen-like tools.
"-DLLVM_ENABLE_PROJECTS=${
lib.concatStringsSep ";" [
"llvm"
"clang"
"clang-tools-extra"
"mlir"
]
lib.concatStringsSep ";" (
[
"llvm"
"clang"
"clang-tools-extra"
]
++ lib.optionals (lib.versionAtLeast release_version "16") [
"mlir"
]
)
}"
] ++ devExtraCmakeFlags;
@@ -82,13 +98,19 @@ let
ninjaFlags =
[
"clang-tblgen"
"clang-tidy-confusable-chars-gen"
"llvm-tblgen"
]
++ lib.optionals (lib.versionAtLeast release_version "15") [
"clang-tidy-confusable-chars-gen"
]
++ lib.optionals (lib.versionAtLeast release_version "16") [
"mlir-tblgen"
]
++ lib.optionals (lib.versionOlder release_version "20") [
"clang-pseudo-gen" # Removed in LLVM 20 @ ed8f78827895050442f544edef2933a60d4a7935.
];
++
lib.optionals ((lib.versionAtLeast release_version "15") && (lib.versionOlder release_version "20"))
[
"clang-pseudo-gen" # Removed in LLVM 20 @ ed8f78827895050442f544edef2933a60d4a7935.
];
installPhase = ''
mkdir -p $out