diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2023-01-30 19:21:05 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2023-01-30 22:23:36 +0000 |
commit | b9a9dfc3d4596825d98bb87b7f488ff1a5d765f1 (patch) | |
tree | fbf40cb4ae488c954dd94a647bc68b19f398fc5d /pkgs/development/compilers/llvm | |
parent | 106af1cb72e38d0ea21a3e60dee36fa2cb1288f1 (diff) | |
download | nixlib-b9a9dfc3d4596825d98bb87b7f488ff1a5d765f1.tar nixlib-b9a9dfc3d4596825d98bb87b7f488ff1a5d765f1.tar.gz nixlib-b9a9dfc3d4596825d98bb87b7f488ff1a5d765f1.tar.bz2 nixlib-b9a9dfc3d4596825d98bb87b7f488ff1a5d765f1.tar.lz nixlib-b9a9dfc3d4596825d98bb87b7f488ff1a5d765f1.tar.xz nixlib-b9a9dfc3d4596825d98bb87b7f488ff1a5d765f1.tar.zst nixlib-b9a9dfc3d4596825d98bb87b7f488ff1a5d765f1.zip |
binutils: consolidate plugin-api.h support in a single
I got the plugin API support at least once incorrect. Instead of copying the deifnition let's consolidate it within binutils itself. While at it forward-ported changes to llvm_{13,14,15}. The change is a no-op from rebuild perspective.
Diffstat (limited to 'pkgs/development/compilers/llvm')
11 files changed, 14 insertions, 11 deletions
diff --git a/pkgs/development/compilers/llvm/10/llvm/default.nix b/pkgs/development/compilers/llvm/10/llvm/default.nix index 5cae255b5825..41c20ac47ebf 100644 --- a/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -5,7 +5,7 @@ , cmake , python3 , libffi -, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi) +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 diff --git a/pkgs/development/compilers/llvm/11/llvm/default.nix b/pkgs/development/compilers/llvm/11/llvm/default.nix index 67f23bfa6604..93cf2757c652 100644 --- a/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -5,7 +5,7 @@ , cmake , python3 , libffi -, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi) +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 diff --git a/pkgs/development/compilers/llvm/12/llvm/default.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix index 29f722ae015a..3d5592e19ee5 100644 --- a/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -5,7 +5,7 @@ , cmake , python3 , libffi -, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi) +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 diff --git a/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix index 32e96212fa57..e2d6da816f32 100644 --- a/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -5,6 +5,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -153,7 +154,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix index 5437735f78fe..d8010ecf893d 100644 --- a/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -6,6 +6,7 @@ , cmake , python3 , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -165,7 +166,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/15/llvm/default.nix b/pkgs/development/compilers/llvm/15/llvm/default.nix index e0b79a9acfef..de98c4361531 100644 --- a/pkgs/development/compilers/llvm/15/llvm/default.nix +++ b/pkgs/development/compilers/llvm/15/llvm/default.nix @@ -9,6 +9,7 @@ , python3 , python3Packages , libffi +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 @@ -327,7 +328,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (!isDarwin) [ + ] ++ optionals (enableGoldPlugin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/5/llvm/default.nix b/pkgs/development/compilers/llvm/5/llvm/default.nix index 45cf4ca90dd8..31b88098c83a 100644 --- a/pkgs/development/compilers/llvm/5/llvm/default.nix +++ b/pkgs/development/compilers/llvm/5/llvm/default.nix @@ -5,7 +5,7 @@ , cmake , python3 , libffi -, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi) +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libxml2 , ncurses diff --git a/pkgs/development/compilers/llvm/6/llvm/default.nix b/pkgs/development/compilers/llvm/6/llvm/default.nix index 5caeb2381d2d..954887cd2368 100644 --- a/pkgs/development/compilers/llvm/6/llvm/default.nix +++ b/pkgs/development/compilers/llvm/6/llvm/default.nix @@ -4,7 +4,7 @@ , cmake , python3 , libffi -, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi) +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libxml2 , ncurses diff --git a/pkgs/development/compilers/llvm/7/llvm/default.nix b/pkgs/development/compilers/llvm/7/llvm/default.nix index f06d7bd772c1..eaeef3c2ef50 100644 --- a/pkgs/development/compilers/llvm/7/llvm/default.nix +++ b/pkgs/development/compilers/llvm/7/llvm/default.nix @@ -5,7 +5,7 @@ , cmake , python3 , libffi -, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi) +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 diff --git a/pkgs/development/compilers/llvm/8/llvm/default.nix b/pkgs/development/compilers/llvm/8/llvm/default.nix index 7e5f705ba7be..aa76fc0c3cf7 100644 --- a/pkgs/development/compilers/llvm/8/llvm/default.nix +++ b/pkgs/development/compilers/llvm/8/llvm/default.nix @@ -5,7 +5,7 @@ , cmake , python3 , libffi -, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi) +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 diff --git a/pkgs/development/compilers/llvm/9/llvm/default.nix b/pkgs/development/compilers/llvm/9/llvm/default.nix index f97512168031..89bc014f5c65 100644 --- a/pkgs/development/compilers/llvm/9/llvm/default.nix +++ b/pkgs/development/compilers/llvm/9/llvm/default.nix @@ -5,7 +5,7 @@ , cmake , python3 , libffi -, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi) +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 |