From a10d67619900daa500e010a3c68c1e7799c32eb8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 3 Mar 2023 13:16:09 +0000 Subject: [PATCH] llvm: tighten platforms LLVM can't be built for all architectures supported by Nixpkgs (s390, and for some versions m68k and RISC-V). --- pkgs/development/compilers/llvm/10/default.nix | 12 +++++++++++- pkgs/development/compilers/llvm/11/default.nix | 12 +++++++++++- pkgs/development/compilers/llvm/12/default.nix | 12 +++++++++++- pkgs/development/compilers/llvm/13/default.nix | 12 +++++++++++- pkgs/development/compilers/llvm/14/default.nix | 13 ++++++++++++- pkgs/development/compilers/llvm/15/default.nix | 13 ++++++++++++- pkgs/development/compilers/llvm/5/default.nix | 11 ++++++++++- pkgs/development/compilers/llvm/6/default.nix | 11 ++++++++++- pkgs/development/compilers/llvm/7/default.nix | 12 +++++++++++- pkgs/development/compilers/llvm/8/default.nix | 12 +++++++++++- pkgs/development/compilers/llvm/9/default.nix | 12 +++++++++++- pkgs/development/compilers/llvm/git/default.nix | 13 ++++++++++++- 12 files changed, 133 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index 4d46863fea1a..75985e962479 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -32,7 +32,17 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # 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; }; tools = lib.makeExtensible (tools: let diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index fdaba0ca2be4..6f73f50e3183 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -34,7 +34,17 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # 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; }; tools = lib.makeExtensible (tools: let diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 73f53350206b..b936b35b155a 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -35,7 +35,17 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # 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; }; tools = lib.makeExtensible (tools: let diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index 29dda832e449..0bc17119125b 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -37,7 +37,17 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # 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; }; tools = lib.makeExtensible (tools: let diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index 314a882db8ef..abf9c533faac 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -37,7 +37,18 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # See llvm/cmake/config-ix.cmake. + platforms = + lib.platforms.aarch64 ++ + lib.platforms.arm ++ + lib.platforms.m68k ++ + lib.platforms.mips ++ + lib.platforms.power ++ + lib.platforms.riscv ++ + lib.platforms.s390x ++ + lib.platforms.wasi ++ + lib.platforms.x86; }; tools = lib.makeExtensible (tools: let diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index d12e705702bd..d4fd2d9bec6d 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -86,7 +86,18 @@ in let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # See llvm/cmake/config-ix.cmake. + platforms = + lib.platforms.aarch64 ++ + lib.platforms.arm ++ + lib.platforms.m68k ++ + lib.platforms.mips ++ + lib.platforms.power ++ + lib.platforms.riscv ++ + lib.platforms.s390x ++ + lib.platforms.wasi ++ + lib.platforms.x86; }; tools = lib.makeExtensible (tools: let diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index d446608d3535..4a8c27471acc 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -20,7 +20,16 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # See llvm/cmake/config-ix.cmake. + platforms = + lib.platforms.aarch64 ++ + lib.platforms.arm ++ + lib.platforms.mips ++ + lib.platforms.power ++ + lib.platforms.s390x ++ + lib.platforms.wasi ++ + lib.platforms.x86; }; tools = lib.makeExtensible (tools: let diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index e5b5094f05cc..fef543e39d82 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -20,7 +20,16 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # See llvm/cmake/config-ix.cmake. + platforms = + lib.platforms.aarch64 ++ + lib.platforms.arm ++ + lib.platforms.mips ++ + lib.platforms.power ++ + lib.platforms.s390x ++ + lib.platforms.wasi ++ + lib.platforms.x86; }; tools = lib.makeExtensible (tools: let diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 3fc0b359ad6c..9ae8358587b9 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -32,7 +32,17 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # 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; }; tools = lib.makeExtensible (tools: let diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index d628eab46509..9401bb34650a 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -32,7 +32,17 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # 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; }; tools = lib.makeExtensible (tools: let diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index 57187c5ecf1e..0a803e3c3dc1 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -32,7 +32,17 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # 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; }; tools = lib.makeExtensible (tools: let diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index 67c6bcf44373..288798c31891 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -36,7 +36,18 @@ let llvm_meta = { license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; - platforms = lib.platforms.all; + + # See llvm/cmake/config-ix.cmake. + platforms = + lib.platforms.aarch64 ++ + lib.platforms.arm ++ + lib.platforms.m68k ++ + lib.platforms.mips ++ + lib.platforms.power ++ + lib.platforms.riscv ++ + lib.platforms.s390x ++ + lib.platforms.wasi ++ + lib.platforms.x86; }; tools = lib.makeExtensible (tools: let