diff --git a/pkgs/development/compilers/llvm/common/lldb/default.nix b/pkgs/development/compilers/llvm/common/lldb/default.nix index f67da5042667..ac4c4fbacd7f 100644 --- a/pkgs/development/compilers/llvm/common/lldb/default.nix +++ b/pkgs/development/compilers/llvm/common/lldb/default.nix @@ -70,7 +70,14 @@ stdenv.mkDerivation ( sourceRoot = "${finalAttrs.src.name}/lldb"; - patches = [ ./gnu-install-dirs.patch ]; + patches = [ + ./gnu-install-dirs.patch + ] + ++ lib.optional (lib.versions.major release_version == "18") [ + # Fix build with gcc15 + # https://github.com/llvm/llvm-project/commit/bb59f04e7e75dcbe39f1bf952304a157f0035314 + ./lldb-add-include-cstdint.patch + ]; nativeBuildInputs = [ cmake diff --git a/pkgs/development/compilers/llvm/common/lldb/lldb-add-include-cstdint.patch b/pkgs/development/compilers/llvm/common/lldb/lldb-add-include-cstdint.patch new file mode 100644 index 000000000000..2ca0b9a3eb38 --- /dev/null +++ b/pkgs/development/compilers/llvm/common/lldb/lldb-add-include-cstdint.patch @@ -0,0 +1,16 @@ +Rebase of upstream commit: +https://github.com/llvm/llvm-project/commit/bb59f04e7e75dcbe39f1bf952304a157f0035314 + +diff --git a/include/lldb/Utility/AddressableBits.h b/include/lldb/Utility/AddressableBits.h +index 0d27c3561ec27..8c7a1ec5f52c0 100644 +--- a/include/lldb/Utility/AddressableBits.h ++++ b/include/lldb/Utility/AddressableBits.h +@@ -12,6 +12,8 @@ + #include "lldb/lldb-forward.h" + ++#include ++ + namespace lldb_private { + + /// \class AddressableBits AddressableBits.h "lldb/Core/AddressableBits.h" +