From 91f4a420cd2184d2edf0365e9fca365dcf2ea21f Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Fri, 11 Sep 2026 10:19:29 -0400 Subject: [PATCH 1/2] Tests/Cuda: Remove redundant condition `CMake_TEST_CUDA` must be set to enter this directory. --- Tests/Cuda/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/Cuda/CMakeLists.txt b/Tests/Cuda/CMakeLists.txt index 62c58b9e34..ec955575f7 100644 --- a/Tests/Cuda/CMakeLists.txt +++ b/Tests/Cuda/CMakeLists.txt @@ -25,7 +25,7 @@ add_cuda_test_macro(Cuda.StaticRuntimePlusToolkit StaticRuntimePlusToolkit) add_cuda_test_macro(Cuda.Complex CudaComplex) add_cuda_test_macro(Cuda.ProperLinkFlags ProperLinkFlags) -if(CMake_TEST_CUDA AND NOT CMake_TEST_CUDA STREQUAL "Clang") +if(NOT CMake_TEST_CUDA STREQUAL "Clang") # Clang lacks __CUDACC_VER*__ defines. add_cuda_test_macro(Cuda.ProperDeviceLibraries ProperDeviceLibraries) add_cuda_test_macro(Cuda.ToolkitBeforeLang ToolkitBeforeLang) From 6131353bffcffa258a60c4dc265a319e673d0895 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Fri, 11 Sep 2026 10:19:29 -0400 Subject: [PATCH 2/2] Tests/Cuda: Skip unsupported case using Clang offloading driver with RDC + PTX Issue: #28084 --- Tests/Cuda/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Tests/Cuda/CMakeLists.txt b/Tests/Cuda/CMakeLists.txt index ec955575f7..f0e097e100 100644 --- a/Tests/Cuda/CMakeLists.txt +++ b/Tests/Cuda/CMakeLists.txt @@ -22,10 +22,12 @@ add_cuda_test_macro(Cuda.Toolkit Toolkit) add_cuda_test_macro(Cuda.IncludePathNoToolkit IncludePathNoToolkit) add_cuda_test_macro(Cuda.SharedRuntimePlusToolkit SharedRuntimePlusToolkit) add_cuda_test_macro(Cuda.StaticRuntimePlusToolkit StaticRuntimePlusToolkit) -add_cuda_test_macro(Cuda.Complex CudaComplex) add_cuda_test_macro(Cuda.ProperLinkFlags ProperLinkFlags) if(NOT CMake_TEST_CUDA STREQUAL "Clang") + # Clang 20+ lack support for RDC+PTX + add_cuda_test_macro(Cuda.Complex CudaComplex) + # Clang lacks __CUDACC_VER*__ defines. add_cuda_test_macro(Cuda.ProperDeviceLibraries ProperDeviceLibraries) add_cuda_test_macro(Cuda.ToolkitBeforeLang ToolkitBeforeLang)