mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 09:23:01 +00:00
86c28ee650
PR #275947, which was self-merged without approvals, inserted functionality specific to a propriteary closed-source compiler (CUDA) into cc-wrapper. This commit relocates this CUDA-specific functionality into the appropritate place: `cuda-modules`. It is unclear to me exactly what this function is supposed to be doing; much of it (like the `.kind` attributes) do not appear to be used *anywhere* in nixpkgs. Making sure we don't insert unexplained deadcode like this is one of the important functions of the review process.
53 lines
1.8 KiB
Nix
53 lines
1.8 KiB
Nix
{
|
|
lib,
|
|
nvccCompatibilities,
|
|
cudaVersion,
|
|
pkgs,
|
|
overrideCC,
|
|
stdenv,
|
|
wrapCCWith,
|
|
stdenvAdapters,
|
|
}:
|
|
|
|
let
|
|
gccMajorVersion = nvccCompatibilities.${cudaVersion}.gccMaxMajorVersion;
|
|
cudaStdenv = stdenvAdapters.useLibsFrom stdenv pkgs."gcc${gccMajorVersion}Stdenv";
|
|
passthruExtra = {
|
|
nixpkgsCompatibleLibstdcxx = lib.warn "cudaPackages.backendStdenv.nixpkgsCompatibleLibstdcxx is misnamed, deprecated, and will be removed after 24.05" cudaStdenv.cc.cxxStdlib.package;
|
|
# cc already exposed
|
|
};
|
|
assertCondition = true;
|
|
in
|
|
|
|
/*
|
|
# We should use libstdc++ at least as new as nixpkgs' stdenv's one.
|
|
assert let
|
|
cxxStdlibCuda = cudaStdenv.cc.cxxStdlib.package;
|
|
cxxStdlibNixpkgs = stdenv.cc.cxxStdlib.package;
|
|
|
|
# Expose the C++ standard library we're using. See the comments on "General
|
|
# libc++ support". This is also relevant when using older gcc than the
|
|
# stdenv's, as may be required e.g. by CUDAToolkit's nvcc.
|
|
cxxStdlib = libcxx:
|
|
let
|
|
givenLibcxx = libcxx != null && (libcxx.isLLVM or false);
|
|
givenGccForLibs = libcxx != null && !(libcxx.isLLVM or false) && (libcxx.isGNU or false);
|
|
libcxx_solib = "${lib.getLib libcxx}/lib";
|
|
in
|
|
if (!givenLibcxx) && givenGccForLibs then
|
|
{ kind = "libstdc++"; package = libcxx; solib = libcxx_solib; }
|
|
else if givenLibcxx then
|
|
{ kind = "libc++"; package = libcxx; solib = libcxx_solib;}
|
|
else
|
|
# We're probably using the `libstdc++` that came with our `gcc`.
|
|
# TODO: this is maybe not always correct?
|
|
# TODO: what happens when `nativeTools = true`?
|
|
{ kind = "libstdc++"; package = cc; solib = cc_solib; }
|
|
;
|
|
in
|
|
((stdenv.cc.cxxStdlib.kind or null) == "libstdc++")
|
|
-> lib.versionAtLeast cxxStdlibCuda.version cxxStdlibNixpkgs.version;
|
|
*/
|
|
|
|
lib.extendDerivation assertCondition passthruExtra cudaStdenv
|