llvmPackages_*.lldClang: don't wrap bintools twice

The bintools argument received a wrapped version of tools.bintools which
is already wrapped. Wrapped bintools twice leads to users of lldClang
being unable to find the tools which are not wrapped like ar.
launchpad/nixpkgs/master
sternenseemann 3 years ago
parent 5687a345be
commit 3eaa00879c
  1. 4
      pkgs/development/compilers/llvm/10/default.nix
  2. 4
      pkgs/development/compilers/llvm/11/default.nix
  3. 4
      pkgs/development/compilers/llvm/12/default.nix
  4. 4
      pkgs/development/compilers/llvm/7/default.nix
  5. 4
      pkgs/development/compilers/llvm/8/default.nix
  6. 4
      pkgs/development/compilers/llvm/9/default.nix

@ -93,9 +93,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

@ -95,9 +95,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

@ -113,9 +113,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

@ -92,9 +92,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

@ -93,9 +93,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

@ -93,9 +93,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

Loading…
Cancel
Save