r348504 - [CUDA] Fix nvidia-cuda-toolkit detection on Ubuntu

Joel E. Denny via cfe-commits cfe-commits at lists.llvm.org
Thu Dec 6 09:46:17 PST 2018


Author: jdenny
Date: Thu Dec  6 09:46:17 2018
New Revision: 348504

URL: http://llvm.org/viewvc/llvm-project?rev=348504&view=rev
Log:
[CUDA] Fix nvidia-cuda-toolkit detection on Ubuntu

This just extends D40453 (r319317) to Ubuntu.

Reviewed By: Hahnfeld, tra

Differential Revision: https://reviews.llvm.org/D55269

Modified:
    cfe/trunk/lib/Driver/ToolChains/Cuda.cpp

Modified: cfe/trunk/lib/Driver/ToolChains/Cuda.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Cuda.cpp?rev=348504&r1=348503&r2=348504&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains/Cuda.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains/Cuda.cpp Thu Dec  6 09:46:17 2018
@@ -114,7 +114,7 @@ CudaInstallationDetector::CudaInstallati
     for (const char *Ver : Versions)
       Candidates.emplace_back(D.SysRoot + "/usr/local/cuda-" + Ver);
 
-    if (Distro(D.getVFS()).IsDebian())
+    if (Distro(D.getVFS()).IsDebian() || Distro(D.getVFS()).IsUbuntu())
       // Special case for Debian to have nvidia-cuda-toolkit work
       // out of the box. More info on http://bugs.debian.org/882505
       Candidates.emplace_back(D.SysRoot + "/usr/lib/cuda");




More information about the cfe-commits mailing list