From 2da5afa244aa22a8144a0625b72fb668729ffd51 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 29 Nov 2017 16:05:59 +0000 Subject: [PATCH] Remove update-cuda-search-path.patch (applied upstream) --- debian/changelog | 1 + debian/patches/series | 2 -- debian/patches/update-cuda-search-path.patch | 24 -------------------- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 debian/patches/update-cuda-search-path.patch diff --git a/debian/changelog b/debian/changelog index 980b7780..bbd92f6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ llvm-toolchain-snapshot (1:6.0~svn315736-2) unstable; urgency=medium * Fix the fix-scan-view-path.diff path * Move libomp-dev from Suggests to Recommends (Closes: #882781) * Add a symlink to fix lldb-X.Y (Closes: #881993) + * Remove update-cuda-search-path.patch (applied upstream) -- Sylvestre Ledru Mon, 16 Oct 2017 10:24:33 +0200 diff --git a/debian/patches/series b/debian/patches/series index e82717ce..017d8a4b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -45,5 +45,3 @@ disable-error-xray.diff lldb-disable-swig-error.diff silent-test-macho.diff silent-llvm-isel-fuzzer.diff -update-cuda-search-path.patch - diff --git a/debian/patches/update-cuda-search-path.patch b/debian/patches/update-cuda-search-path.patch deleted file mode 100644 index 901b7644..00000000 --- a/debian/patches/update-cuda-search-path.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Andreas Beckmann -Description: add /usr/lib/cuda to CUDA search paths - nvidia-cuda-toolkit/non-free now provides a shim monolitic cuda install - tree in /usr/lib/cuda (LP: #1706326) that could be used for - clang++ --cuda-path=/usr/lib/cuda - - 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 - -Index: llvm-toolchain-5.0-5.0.1~+rc1/clang/lib/Driver/ToolChains/Cuda.cpp -=================================================================== ---- llvm-toolchain-5.0-5.0.1~+rc1.orig/clang/lib/Driver/ToolChains/Cuda.cpp -+++ llvm-toolchain-5.0-5.0.1~+rc1/clang/lib/Driver/ToolChains/Cuda.cpp -@@ -71,6 +71,7 @@ CudaInstallationDetector::CudaInstallati - 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) {