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.
This commit is contained in:
parent
5687a345be
commit
3eaa00879c
pkgs/development/compilers/llvm
@ -93,9 +93,7 @@ let
|
|||||||
lldClang = wrapCCWith rec {
|
lldClang = wrapCCWith rec {
|
||||||
cc = tools.clang-unwrapped;
|
cc = tools.clang-unwrapped;
|
||||||
libcxx = targetLlvmLibraries.libcxx;
|
libcxx = targetLlvmLibraries.libcxx;
|
||||||
bintools = wrapBintoolsWith {
|
inherit (tools) bintools;
|
||||||
inherit (tools) bintools;
|
|
||||||
};
|
|
||||||
extraPackages = [
|
extraPackages = [
|
||||||
targetLlvmLibraries.libcxxabi
|
targetLlvmLibraries.libcxxabi
|
||||||
targetLlvmLibraries.compiler-rt
|
targetLlvmLibraries.compiler-rt
|
||||||
|
@ -95,9 +95,7 @@ let
|
|||||||
lldClang = wrapCCWith rec {
|
lldClang = wrapCCWith rec {
|
||||||
cc = tools.clang-unwrapped;
|
cc = tools.clang-unwrapped;
|
||||||
libcxx = targetLlvmLibraries.libcxx;
|
libcxx = targetLlvmLibraries.libcxx;
|
||||||
bintools = wrapBintoolsWith {
|
inherit (tools) bintools;
|
||||||
inherit (tools) bintools;
|
|
||||||
};
|
|
||||||
extraPackages = [
|
extraPackages = [
|
||||||
targetLlvmLibraries.libcxxabi
|
targetLlvmLibraries.libcxxabi
|
||||||
targetLlvmLibraries.compiler-rt
|
targetLlvmLibraries.compiler-rt
|
||||||
|
@ -113,9 +113,7 @@ let
|
|||||||
lldClang = wrapCCWith rec {
|
lldClang = wrapCCWith rec {
|
||||||
cc = tools.clang-unwrapped;
|
cc = tools.clang-unwrapped;
|
||||||
libcxx = targetLlvmLibraries.libcxx;
|
libcxx = targetLlvmLibraries.libcxx;
|
||||||
bintools = wrapBintoolsWith {
|
inherit (tools) bintools;
|
||||||
inherit (tools) bintools;
|
|
||||||
};
|
|
||||||
extraPackages = [
|
extraPackages = [
|
||||||
targetLlvmLibraries.libcxxabi
|
targetLlvmLibraries.libcxxabi
|
||||||
targetLlvmLibraries.compiler-rt
|
targetLlvmLibraries.compiler-rt
|
||||||
|
@ -92,9 +92,7 @@ let
|
|||||||
lldClang = wrapCCWith rec {
|
lldClang = wrapCCWith rec {
|
||||||
cc = tools.clang-unwrapped;
|
cc = tools.clang-unwrapped;
|
||||||
libcxx = targetLlvmLibraries.libcxx;
|
libcxx = targetLlvmLibraries.libcxx;
|
||||||
bintools = wrapBintoolsWith {
|
inherit (tools) bintools;
|
||||||
inherit (tools) bintools;
|
|
||||||
};
|
|
||||||
extraPackages = [
|
extraPackages = [
|
||||||
targetLlvmLibraries.libcxxabi
|
targetLlvmLibraries.libcxxabi
|
||||||
targetLlvmLibraries.compiler-rt
|
targetLlvmLibraries.compiler-rt
|
||||||
|
@ -93,9 +93,7 @@ let
|
|||||||
lldClang = wrapCCWith rec {
|
lldClang = wrapCCWith rec {
|
||||||
cc = tools.clang-unwrapped;
|
cc = tools.clang-unwrapped;
|
||||||
libcxx = targetLlvmLibraries.libcxx;
|
libcxx = targetLlvmLibraries.libcxx;
|
||||||
bintools = wrapBintoolsWith {
|
inherit (tools) bintools;
|
||||||
inherit (tools) bintools;
|
|
||||||
};
|
|
||||||
extraPackages = [
|
extraPackages = [
|
||||||
targetLlvmLibraries.libcxxabi
|
targetLlvmLibraries.libcxxabi
|
||||||
targetLlvmLibraries.compiler-rt
|
targetLlvmLibraries.compiler-rt
|
||||||
|
@ -93,9 +93,7 @@ let
|
|||||||
lldClang = wrapCCWith rec {
|
lldClang = wrapCCWith rec {
|
||||||
cc = tools.clang-unwrapped;
|
cc = tools.clang-unwrapped;
|
||||||
libcxx = targetLlvmLibraries.libcxx;
|
libcxx = targetLlvmLibraries.libcxx;
|
||||||
bintools = wrapBintoolsWith {
|
inherit (tools) bintools;
|
||||||
inherit (tools) bintools;
|
|
||||||
};
|
|
||||||
extraPackages = [
|
extraPackages = [
|
||||||
targetLlvmLibraries.libcxxabi
|
targetLlvmLibraries.libcxxabi
|
||||||
targetLlvmLibraries.compiler-rt
|
targetLlvmLibraries.compiler-rt
|
||||||
|
Loading…
Reference in New Issue
Block a user