From cc733c844a37caf7a813b79c839d32ed2be43178 Mon Sep 17 00:00:00 2001 From: Patryk Sondej Date: Wed, 22 Jan 2025 14:16:32 +0100 Subject: [PATCH 1/2] llvmPackages.tblgen: add missing lldb-tblgen --- pkgs/development/compilers/llvm/common/tblgen.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/llvm/common/tblgen.nix b/pkgs/development/compilers/llvm/common/tblgen.nix index 49cbcb0af2ca6..3ff4fbdb56248 100644 --- a/pkgs/development/compilers/llvm/common/tblgen.nix +++ b/pkgs/development/compilers/llvm/common/tblgen.nix @@ -50,6 +50,7 @@ let cp -r ${monorepoSrc}/clang "$out" cp -r ${monorepoSrc}/clang-tools-extra "$out" cp -r ${monorepoSrc}/mlir "$out" + cp -r ${monorepoSrc}/lldb "$out" '' ) else @@ -86,6 +87,7 @@ let "llvm" "clang" "clang-tools-extra" + "lldb" ] ++ lib.optionals (lib.versionAtLeast release_version "16") [ "mlir" @@ -99,6 +101,7 @@ let [ "clang-tblgen" "llvm-tblgen" + "lldb-tblgen" ] ++ lib.optionals (lib.versionAtLeast release_version "15") [ "clang-tidy-confusable-chars-gen" @@ -114,6 +117,10 @@ let installPhase = '' mkdir -p $out + + # Remove useless files + rm -f bin/{lldb-dotest,lldb-repro,llvm-lit,update_core_linalg_named_ops.sh} + cp -ar bin $out/bin ''; }); From 1d6e6197558f6143c10785a2c61aeaf1ec751aec Mon Sep 17 00:00:00 2001 From: Patryk Sondej Date: Mon, 27 Jan 2025 08:14:00 +0100 Subject: [PATCH 2/2] llvmPackages.tblgen: fix build on darwin --- .../compilers/llvm/common/tblgen.nix | 40 +++++++++++-------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/tblgen.nix b/pkgs/development/compilers/llvm/common/tblgen.nix index 3ff4fbdb56248..c18f1bd2787ef 100644 --- a/pkgs/development/compilers/llvm/common/tblgen.nix +++ b/pkgs/development/compilers/llvm/common/tblgen.nix @@ -79,22 +79,30 @@ let python3 ]; - cmakeFlags = [ - # Projects with tablegen-like tools. - "-DLLVM_ENABLE_PROJECTS=${ - lib.concatStringsSep ";" ( - [ - "llvm" - "clang" - "clang-tools-extra" - "lldb" - ] - ++ lib.optionals (lib.versionAtLeast release_version "16") [ - "mlir" - ] - ) - }" - ] ++ devExtraCmakeFlags; + cmakeFlags = + [ + # Projects with tablegen-like tools. + "-DLLVM_ENABLE_PROJECTS=${ + lib.concatStringsSep ";" ( + [ + "llvm" + "clang" + "clang-tools-extra" + "lldb" + ] + ++ lib.optionals (lib.versionAtLeast release_version "16") [ + "mlir" + ] + ) + }" + ] + # LLDB test suite requires libc++ on darwin, but we need compile only lldb-tblgen + # These flags are needed only for evaluating the CMake file. + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-DLLDB_INCLUDE_TESTS=OFF" + "-DLIBXML2_INCLUDE_DIR=/non-existent" + ] + ++ devExtraCmakeFlags; # List of tablegen targets. ninjaFlags =