From 1ead4951db0faad2d05410398fc5e933dff6abd5 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 10 Dec 2021 19:34:01 +0000 Subject: [PATCH] llvmPackages_5.compiler-rt: fix build against gcc-12 [ 11%] Building CXX object lib/xray/CMakeFiles/clang_rt.xray-x86_64.dir/xray_buffer_queue.cc.o In file included from lib/xray/xray_buffer_queue.cc:15: lib/xray/xray_buffer_queue.h:35:5: error: 'size_t' does not name a type 35 | size_t Size = 0; | ^~~~~~ lib/xray/xray_buffer_queue.h:23:1: note: 'size_t' is defined in header ''; did you forget to '#include '? 22 | #include +++ |+#include 23 | --- .../llvm/5/compiler-rt/compiler-rt-5-cstddef.patch | 10 ++++++++++ .../compilers/llvm/5/compiler-rt/default.nix | 1 + 2 files changed, 11 insertions(+) create mode 100644 pkgs/development/compilers/llvm/5/compiler-rt/compiler-rt-5-cstddef.patch diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/compiler-rt-5-cstddef.patch b/pkgs/development/compilers/llvm/5/compiler-rt/compiler-rt-5-cstddef.patch new file mode 100644 index 000000000000..e7abf9735b90 --- /dev/null +++ b/pkgs/development/compilers/llvm/5/compiler-rt/compiler-rt-5-cstddef.patch @@ -0,0 +1,10 @@ +--- a/lib/xray/xray_buffer_queue.h ++++ b/lib/xray/xray_buffer_queue.h +@@ -17,6 +17,7 @@ + + #include "sanitizer_common/sanitizer_atomic.h" + #include "sanitizer_common/sanitizer_mutex.h" ++#include + #include + #include + #include diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/default.nix b/pkgs/development/compilers/llvm/5/compiler-rt/default.nix index 874540dd8c3b..f6f59bb6d99b 100644 --- a/pkgs/development/compilers/llvm/5/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/5/compiler-rt/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation { ./sys-ustat.patch ../../common/compiler-rt/libsanitizer-no-cyclades-9.patch + ./compiler-rt-5-cstddef.patch ] ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks