Merge pull request #139812 from Princemachiavelli/rocm_compiler-rt_no_cyclades

compiler-rt: cont. remove <cyclades.h> from libsanitizer
This commit is contained in:
Bernardo Meurer 2021-09-30 22:06:28 +00:00 committed by GitHub
commit 9ae3e76435
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
{ stdenv, lib, version, src, cmake, python3, llvm, libcxxabi }:
{ stdenv, lib, version, src, cmake, python3, llvm, libcxxabi, fetchpatch }:
stdenv.mkDerivation rec {
pname = "compiler-rt";
inherit version src;
@ -31,7 +31,13 @@ stdenv.mkDerivation rec {
patches = [
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
];
(fetchpatch {
name = "libsanitizer-no-cyclades-rocm.patch";
url = "https://reviews.llvm.org/file/data/nrhbpc5axblqwx2xyyzv/PHID-FILE-wwcpjvquusomoddmqcwo/file";
sha256 = "sha256-PMMSLr2zHuNDn1OWqumqHwB74ktJSHxhJWkqEKB7Z64=";
stripLen = 1;
})
];
# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks