]> granicus.if.org Git - clang/commitdiff
[CUDA] Fix nvidia-cuda-toolkit detection on Ubuntu
authorJoel E. Denny <jdenny.ornl@gmail.com>
Thu, 6 Dec 2018 17:46:17 +0000 (17:46 +0000)
committerJoel E. Denny <jdenny.ornl@gmail.com>
Thu, 6 Dec 2018 17:46:17 +0000 (17:46 +0000)
This just extends D40453 (r319317) to Ubuntu.

Reviewed By: Hahnfeld, tra

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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@348504 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Driver/ToolChains/Cuda.cpp

index b298617293220578324ec0dae89972b6dba48db4..a8363b2f95b1381f1c547d10a164d4a04f0f6af5 100644 (file)
@@ -114,7 +114,7 @@ CudaInstallationDetector::CudaInstallationDetector(
     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");