From 4a880d2484c64fb87d8a210c9a7db9b91fa3cad1 Mon Sep 17 00:00:00 2001 From: Peter Waller Date: Fri, 6 Dec 2024 11:26:22 +0000 Subject: [PATCH] llvmPackages.bolt: Use ninja, drop libclang dependency Using ninja makes it consistent with the other llvm package builds, and libclang is not necessary as a dependency. Signed-off-by: Peter Waller --- pkgs/development/compilers/llvm/common/bolt/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/bolt/default.nix b/pkgs/development/compilers/llvm/common/bolt/default.nix index d62841b48d0a..d6a7fae48161 100644 --- a/pkgs/development/compilers/llvm/common/bolt/default.nix +++ b/pkgs/development/compilers/llvm/common/bolt/default.nix @@ -8,6 +8,7 @@ cmake, libxml2, libllvm, + ninja, libclang, version, python3, @@ -32,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r ${monorepoSrc}/${finalAttrs.pname} "$out" cp -r ${monorepoSrc}/third-party "$out" - # tablegen stuff, probably not the best way but it works... + # BOLT re-runs tablegen against LLVM sources, so needs them available. cp -r ${monorepoSrc}/llvm/ "$out" chmod -R +w $out/llvm '' @@ -42,12 +43,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + ninja python3 ]; buildInputs = [ libllvm - libclang libxml2 ];