mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-06-15 12:35:11 +00:00
Remove update-cuda-search-path.patch (applied upstream)
This commit is contained in:
parent
d40d00cb7b
commit
2da5afa244
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -19,6 +19,7 @@ llvm-toolchain-snapshot (1:6.0~svn315736-2) unstable; urgency=medium
|
|||||||
* Fix the fix-scan-view-path.diff path
|
* Fix the fix-scan-view-path.diff path
|
||||||
* Move libomp-dev from Suggests to Recommends (Closes: #882781)
|
* Move libomp-dev from Suggests to Recommends (Closes: #882781)
|
||||||
* Add a symlink to fix lldb-X.Y (Closes: #881993)
|
* Add a symlink to fix lldb-X.Y (Closes: #881993)
|
||||||
|
* Remove update-cuda-search-path.patch (applied upstream)
|
||||||
|
|
||||||
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 16 Oct 2017 10:24:33 +0200
|
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 16 Oct 2017 10:24:33 +0200
|
||||||
|
|
||||||
|
2
debian/patches/series
vendored
2
debian/patches/series
vendored
@ -45,5 +45,3 @@ disable-error-xray.diff
|
|||||||
lldb-disable-swig-error.diff
|
lldb-disable-swig-error.diff
|
||||||
silent-test-macho.diff
|
silent-test-macho.diff
|
||||||
silent-llvm-isel-fuzzer.diff
|
silent-llvm-isel-fuzzer.diff
|
||||||
update-cuda-search-path.patch
|
|
||||||
|
|
||||||
|
24
debian/patches/update-cuda-search-path.patch
vendored
24
debian/patches/update-cuda-search-path.patch
vendored
@ -1,24 +0,0 @@
|
|||||||
Author: Andreas Beckmann <anbe@debian.org>
|
|
||||||
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) {
|
|
Loading…
Reference in New Issue
Block a user