Update from feedback

Author: aidan.belton

clang/lib/Driver/ToolChains/Cuda.cpp

@@ -202,6 +202,8 @@ CudaInstallationDetector::CudaInstallationDetector(
         LibPath = InstallPath + "/lib/x64";
       else if (FS.exists(InstallPath + "/lib/Win32"))
         LibPath = InstallPath + "/lib/Win32";
+      else if (FS.exists(InstallPath + "/lib"))
+        LibPath = InstallPath + "/lib";
       else
         continue;
     } else {
@@ -746,7 +748,7 @@ void CudaToolChain::addClangTargetOptions(
       for (StringRef LibraryPath : LibraryPaths) {
         SmallString<128> LibSpirvTargetFile(LibraryPath);
         llvm::sys::path::append(LibSpirvTargetFile, LibSpirvTargetName);
-        if (llvm::sys::fs::exists(LibSpirvTargetFile)) {
+        if (llvm::sys::fs::exists(LibSpirvTargetFile) || DriverArgs.hasArg(options::OPT__HASH_HASH_HASH)) {
           LibSpirvFile = std::string(LibSpirvTargetFile.str());
           break;
         }

clang/test/Driver/cuda-nvptx-target.cpp

@@ -0,0 +1,7 @@
+// RUN: %clang -### -fsycl -fsycl-targets=nvptx64-nvidia-cuda-sycldevice -nocudalib -target x86_64-unknown-windows-msvc %s 2> %t.win.out
+// RUN: FileCheck %s --check-prefixes=CHECK-WINDOWS --input-file %t.win.out
+// CHECK-WINDOWS: remangled-l32-signed_char.libspirv-nvptx64--nvidiacl.bc
+//
+// RUN: %clang -### -fsycl -fsycl-targets=nvptx64-nvidia-cuda-sycldevice -nocudalib -target x86_64-unknown-linux-gnu %s 2> %t.lnx.out
+// RUN: FileCheck %s --check-prefixes=CHECK-LINUX --input-file %t.lnx.out
+// CHECK-LINUX: remangled-l64-signed_char.libspirv-nvptx64--nvidiacl.bc