diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index ac982a0ba45..bf3784c9794 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -120,9 +120,7 @@ let lldClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; - bintools = wrapBintoolsWith { - inherit (tools) bintools; - }; + inherit (tools) bintools; extraPackages = [ targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index 3babaa1961f..0e12bbbb2fc 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -121,9 +121,7 @@ let lldClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; - bintools = wrapBintoolsWith { - inherit (tools) bintools; - }; + inherit (tools) bintools; extraPackages = [ targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 4b71a458eb7..2b464864222 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -127,9 +127,7 @@ let lldClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; - bintools = wrapBintoolsWith { - inherit (tools) bintools; - }; + inherit (tools) bintools; extraPackages = [ targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 43a397a1cf8..5dbe4e0d8f3 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -126,9 +126,7 @@ let lldClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; - bintools = wrapBintoolsWith { - inherit (tools) bintools; - }; + inherit (tools) bintools; extraPackages = [ targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index f946d991f59..9131a873b3b 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -127,9 +127,7 @@ let lldClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; - bintools = wrapBintoolsWith { - inherit (tools) bintools; - }; + inherit (tools) bintools; extraPackages = [ targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index b93e05d614b..383a1260271 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -127,9 +127,7 @@ let lldClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; - bintools = wrapBintoolsWith { - inherit (tools) bintools; - }; + inherit (tools) bintools; extraPackages = [ targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt