mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-17 06:06:13 +03:00
cudaPackages.backendStdenv: drop the commented out code
This commit is contained in:
parent
e48abe92fd
commit
fb6b84603e
@ -19,34 +19,6 @@ let
|
||||
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;
|
||||
*/
|
||||
/* TODO: Consider testing whether we in fact use the newer libstdc++ */
|
||||
|
||||
lib.extendDerivation assertCondition passthruExtra cudaStdenv
|
||||
|
Loading…
Reference in New Issue
Block a user