From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Fri, 22 Dec 2017 10:42:46 +0000 (+0000)
Subject: update-cuda-search-path
X-Git-Tag: archive/raspbian/1%5.0.1-2+rpi1^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6b5f3c96d4ab6c6838eabe6beb46c6db14814f3a;p=llvm-toolchain-5.0.git

update-cuda-search-path

 let clang try that path by default, too, s.t. an explicit --cuda-path is
 not needed for the nvidia-cuda-toolkit/non-free packages

 try the new path *after* the default paths /usr/local/cuda{,-X.Y}
 to not interfere with cuda installations from nvidia's installer


Gbp-Pq: Name update-cuda-search-path.patch
---

diff --git a/clang/lib/Driver/ToolChains/Cuda.cpp b/clang/lib/Driver/ToolChains/Cuda.cpp
index 935a5a37a..d0e7fdd75 100644
--- a/clang/lib/Driver/ToolChains/Cuda.cpp
+++ b/clang/lib/Driver/ToolChains/Cuda.cpp
@@ -71,6 +71,7 @@ CudaInstallationDetector::CudaInstallationDetector(
     CudaPathCandidates.push_back(D.SysRoot + "/usr/local/cuda");
     for (const char *Ver : Versions)
       CudaPathCandidates.push_back(D.SysRoot + "/usr/local/cuda-" + Ver);
+    CudaPathCandidates.push_back(D.SysRoot + "/usr/lib/cuda");
   }
 
   for (const auto &CudaPath : CudaPathCandidates) {