From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Mon, 2 Jul 2018 08:45:18 +0000 (+0100)
Subject: update-cuda-search-path
X-Git-Tag: archive/raspbian/1%4.0.1-10_deb9u2+rpi1~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=46909591c76b39c28a5bde9a9a1c04589c4b65ee;p=llvm-toolchain-4.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.cpp b/clang/lib/Driver/ToolChains.cpp
index 189670ee5..5e1ddc349 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -1825,6 +1825,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) {