From 2d51e2696b046d5b583dbae0696e1fda0a293136 Mon Sep 17 00:00:00 2001 From: Simon Renblad Date: Thu, 6 Jun 2024 10:49:42 +0800 Subject: [PATCH] llvm: patch for artiq-zynq release-7 --- llvm/11/default.nix | 5 +---- llvm/11/llvm/default.nix | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/llvm/11/default.nix b/llvm/11/default.nix index 6ce7d86..458b7b1 100644 --- a/llvm/11/default.nix +++ b/llvm/11/default.nix @@ -33,16 +33,13 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = lib.teams.llvm.members; # See llvm/cmake/config-ix.cmake. platforms = lib.platforms.aarch64 ++ lib.platforms.arm ++ lib.platforms.mips ++ - lib.platforms.power ++ lib.platforms.riscv ++ - lib.platforms.s390x ++ lib.platforms.wasi ++ lib.platforms.x86; }; @@ -294,6 +291,6 @@ let inherit llvm_meta targetLlvm; }; }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; + noExtend = extensible: builtins.removeAttrs extensible [ "extend" ]; in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/llvm/11/llvm/default.nix b/llvm/11/llvm/default.nix index 01e6483..db0a821 100644 --- a/llvm/11/llvm/default.nix +++ b/llvm/11/llvm/default.nix @@ -5,7 +5,7 @@ , cmake , python3 , libffi -, enableGoldPlugin ? libbfd.hasPluginAPI +, enableGoldPlugin ? false , libbfd , libpfm , libxml2 -- 2.44.2