From e5064b957a8f75f44762e71018cbaf452675b83e Mon Sep 17 00:00:00 2001 From: Slava Gorbunov Date: Mon, 8 Apr 2024 14:25:20 +0300 Subject: [PATCH] llvm: Don't depend on binutils for ghcjs platform This dependency was introduced by unconditionally enabled enableGoldPlugin option, which was enabled only if libbfd explicitly supports plugin api prior to llvm-16. In llvm-17+ it was enabled unconditionally (unless overriden explicitly), which introduces dependency on binutils for target platform and breaks build for platforms that are not supported by binutils (such as ghcjs). --- pkgs/development/compilers/llvm/17/llvm/default.nix | 2 +- pkgs/development/compilers/llvm/18/llvm/default.nix | 2 +- pkgs/development/compilers/llvm/git/llvm/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/17/llvm/default.nix b/pkgs/development/compilers/llvm/17/llvm/default.nix index ec2edabe4ec5..a045bea9f472 100644 --- a/pkgs/development/compilers/llvm/17/llvm/default.nix +++ b/pkgs/development/compilers/llvm/17/llvm/default.nix @@ -8,7 +8,7 @@ , python3 , python3Packages , libffi -, enableGoldPlugin ? true +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 diff --git a/pkgs/development/compilers/llvm/18/llvm/default.nix b/pkgs/development/compilers/llvm/18/llvm/default.nix index 670171a707f9..a9732763e9d7 100644 --- a/pkgs/development/compilers/llvm/18/llvm/default.nix +++ b/pkgs/development/compilers/llvm/18/llvm/default.nix @@ -8,7 +8,7 @@ , python3 , python3Packages , libffi -, enableGoldPlugin ? true +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index 670171a707f9..a9732763e9d7 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -8,7 +8,7 @@ , python3 , python3Packages , libffi -, enableGoldPlugin ? true +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2