JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

llvmPackages_*.lldClang: don't wrap bintools twice

Browse Source 
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:
sternenseemann 2021-05-14 12:40:48 +02:00
parent 5687a345be
commit 3eaa00879c
6 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/llvm/10/default.nix
View File

@ -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

2
pkgs/development/compilers/llvm/11/default.nix
View File

@ -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

2
pkgs/development/compilers/llvm/12/default.nix
View File

@ -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

2
pkgs/development/compilers/llvm/7/default.nix
View File

@ -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

2
pkgs/development/compilers/llvm/8/default.nix
View File

@ -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

2
pkgs/development/compilers/llvm/9/default.nix
View File

@ -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