Merge pull request #120506 from primeos/llvm
llvmPackages_12: Finalize reorganizing the files
This commit is contained in:
commit
faf4d48554
@ -108,7 +108,7 @@ let
|
|||||||
# doesn’t support like LLVM. Probably we should move to some other
|
# doesn’t support like LLVM. Probably we should move to some other
|
||||||
# file.
|
# file.
|
||||||
|
|
||||||
bintools = callPackage ./bintools.nix {};
|
bintools = callPackage ./bintools {};
|
||||||
|
|
||||||
lldClang = wrapCCWith rec {
|
lldClang = wrapCCWith rec {
|
||||||
cc = tools.clang-unwrapped;
|
cc = tools.clang-unwrapped;
|
||||||
@ -192,18 +192,18 @@ let
|
|||||||
|
|
||||||
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
|
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
|
||||||
|
|
||||||
libcxx = callPackage ./libc++ ({ inherit llvm_meta; } //
|
libcxx = callPackage ./libcxx ({ inherit llvm_meta; } //
|
||||||
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
|
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
|
||||||
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
|
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
|
||||||
}));
|
}));
|
||||||
|
|
||||||
libcxxabi = callPackage ./libc++abi ({ inherit llvm_meta; } //
|
libcxxabi = callPackage ./libcxxabi ({ inherit llvm_meta; } //
|
||||||
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
|
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
|
||||||
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
|
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
|
||||||
libunwind = libraries.libunwind;
|
libunwind = libraries.libunwind;
|
||||||
}));
|
}));
|
||||||
|
|
||||||
openmp = callPackage ./openmp.nix { inherit llvm_meta; };
|
openmp = callPackage ./openmp { inherit llvm_meta; };
|
||||||
|
|
||||||
libunwind = callPackage ./libunwind ({ inherit llvm_meta; } //
|
libunwind = callPackage ./libunwind ({ inherit llvm_meta; } //
|
||||||
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
|
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "libc++";
|
pname = "libcxx";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = fetch "libcxx" "1wf3ww29xkx7prs7pdwicy5qqfapib26110jgmkjrbka9z57bjvx";
|
src = fetch "libcxx" "1wf3ww29xkx7prs7pdwicy5qqfapib26110jgmkjrbka9z57bjvx";
|
@ -3,7 +3,7 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "libc++abi";
|
pname = "libcxxabi";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = fetch "libcxxabi" "1cbmzspwjlr8f6sp73pw6ivf4dpg6rpc61by0q1m2zca2k6yif3a";
|
src = fetch "libcxxabi" "1cbmzspwjlr8f6sp73pw6ivf4dpg6rpc61by0q1m2zca2k6yif3a";
|
Loading…
Reference in New Issue
Block a user