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

llvmPackages: Always put libunwind before openmp

Browse Source 
This keeps the "main bootstrap" together.
This commit is contained in:
John Ericson 2021-05-11 23:57:07 +00:00
parent 4caedc060f
commit 894f0c6ec8
5 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,13 +188,12 @@ let
libunwind = libraries.libunwind; libunwind = libraries.libunwind;
})); }));
openmp = callPackage ./openmp.nix {};
libunwind = callPackage ./libunwind ({} // libunwind = callPackage ./libunwind ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
})); }));
openmp = callPackage ./openmp.nix {};
}); });
in { inherit tools libraries; } // libraries // tools in { inherit tools libraries; } // libraries // tools

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

@ -189,13 +189,12 @@ let
libunwind = libraries.libunwind; libunwind = libraries.libunwind;
})); }));
openmp = callPackage ./openmp.nix {};
libunwind = callPackage ./libunwind ({} // libunwind = callPackage ./libunwind ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
})); }));
openmp = callPackage ./openmp.nix {};
}); });
in { inherit tools libraries; } // libraries // tools in { inherit tools libraries; } // libraries // tools

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

@ -236,7 +236,6 @@ let
}); });
openmp = callPackage ./openmp { inherit llvm_meta; }; openmp = callPackage ./openmp { inherit llvm_meta; };
}); });
in { inherit tools libraries; } // libraries // tools in { inherit tools libraries; } // libraries // tools

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

@ -191,13 +191,12 @@ let
libunwind = libraries.libunwind; libunwind = libraries.libunwind;
})); }));
openmp = callPackage ./openmp.nix {};
libunwind = callPackage ./libunwind ({} // libunwind = callPackage ./libunwind ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
})); }));
openmp = callPackage ./openmp.nix {};
}); });
in { inherit tools libraries; } // libraries // tools in { inherit tools libraries; } // libraries // tools

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

@ -191,13 +191,12 @@ let
libunwind = libraries.libunwind; libunwind = libraries.libunwind;
})); }));
openmp = callPackage ./openmp.nix {};
libunwind = callPackage ./libunwind ({} // libunwind = callPackage ./libunwind ({} //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
})); }));
openmp = callPackage ./openmp.nix {};
}); });
in { inherit tools libraries; } // libraries // tools in { inherit tools libraries; } // libraries // tools