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

Merge pull request #122974 from sternenseemann/lldClang-no-double-wrap

Browse Source 
llvmPackages_*.lldClang: don't wrap bintools twice
This commit is contained in:
John Ericson 2021-05-14 14:52:57 -04:00 committed by GitHub
commit 49d2653653
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

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

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

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

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

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

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