From fb6b84603e01b0e33b80fbab3ea41aea50f69fc0 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sat, 20 Jan 2024 17:31:47 +0000 Subject: [PATCH] cudaPackages.backendStdenv: drop the commented out code --- .../cuda-modules/backend-stdenv.nix | 30 +------------------ 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/pkgs/development/cuda-modules/backend-stdenv.nix b/pkgs/development/cuda-modules/backend-stdenv.nix index 7374c45b58d4..72685b541d15 100644 --- a/pkgs/development/cuda-modules/backend-stdenv.nix +++ b/pkgs/development/cuda-modules/backend-stdenv.nix @@ -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