Merge pull request #150119 from trofi/fix-compiler-rt-5-for-gcc-12

llvmPackages_5.compiler-rt: fix build against gcc-12
2021-12-11 15:00:47 +00:00
parent 11a4b35f53 1ead4951db
commit 2c0adaf246
2 changed files with 11 additions and 0 deletions
@@ -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 <cstddef>
+ #include <deque>
+ #include <unordered_set>
+ #include <utility>
@@ -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