Skip to content

Commit

Permalink
clang_14: drop out-of-date armv7l patch
Browse files Browse the repository at this point in the history
  • Loading branch information
misuzu committed Jun 20, 2022
1 parent fdb531e commit f69c82f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 34 deletions.
32 changes: 0 additions & 32 deletions pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch

This file was deleted.

3 changes: 1 addition & 2 deletions pkgs/development/compilers/llvm/14/compiler-rt/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ stdenv.mkDerivation {
# extra `/`.
./normalize-var.patch
] # Prevent a compilation error on darwin
++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch
++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch;

# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
Expand Down

0 comments on commit f69c82f

Please sign in to comment.