Fix CufRuntime to static version

Author: Meinersbur

flang-rt/cmake/modules/AddFlangRTOffload.cmake

@@ -8,12 +8,6 @@
 
 macro(enable_cuda_compilation name files)
   if (FLANG_RT_EXPERIMENTAL_OFFLOAD_SUPPORT STREQUAL "CUDA")
-    if (BUILD_SHARED_LIBS)
-      message(FATAL_ERROR
-        "BUILD_SHARED_LIBS is not supported for CUDA build of Fortran runtime"
-        )
-    endif()
-
     enable_language(CUDA)
 
     # TODO: figure out how to make target property CUDA_SEPARABLE_COMPILATION
@@ -70,12 +64,6 @@ macro(enable_omp_offload_compilation name files)
   if (FLANG_RT_EXPERIMENTAL_OFFLOAD_SUPPORT STREQUAL "OpenMP")
     # OpenMP offload build only works with Clang compiler currently.
 
-    if (BUILD_SHARED_LIBS)
-      message(FATAL_ERROR
-        "BUILD_SHARED_LIBS is not supported for OpenMP offload build of Fortran runtime"
-        )
-    endif()
-
     if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND
         "${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
 

flang-rt/lib/flang_rt/CUDA/CMakeLists.txt

@@ -6,12 +6,8 @@
 #
 #===------------------------------------------------------------------------===#
 
-# libCufRuntime depends on a certain version of CUDA. To be able to have
-# multiple build of this library with different CUDA version, the version is
-# added to the library name.
-set(CUFRT_LIBNAME CufRuntime_cuda_${CUDAToolkit_VERSION_MAJOR})
 
-add_flangrt_library(${CUFRT_LIBNAME}
+add_flangrt_library(CufRuntime STATIC
   allocatable.cpp
   allocator.cpp
   descriptor.cpp
@@ -20,21 +16,19 @@ add_flangrt_library(${CUFRT_LIBNAME}
   memory.cpp
   registration.cpp
 )
-target_include_directories(${CUFRT_LIBNAME} PRIVATE ${CUDAToolkit_INCLUDE_DIRS})
 
-if (BUILD_SHARED_LIBS)
-  set(CUDA_RT_TARGET CUDA::cudart)
-else()
-  set(CUDA_RT_TARGET CUDA::cudart_static)
-endif()
-
-target_link_libraries(${CUFRT_LIBNAME}
-  PRIVATE
-  flang_rt
-  ${CUDA_RT_TARGET}
+# libCufRuntime depends on a certain version of CUDA. To be able to have
+# multiple build of this library with different CUDA version, the version is
+# added to the library name.
+set_target_properties(CufRuntime
+  PROPERTIES
+    OUTPUT_NAME "CufRuntime_cuda_${CUDAToolkit_VERSION_MAJOR}"
 )
 
-# Phony build target that does not include the CUDA version.
-add_custom_target(CufRuntime)
-add_dependencies(CufRuntime ${CUFRT_LIBNAME})
+target_include_directories(CufRuntime PRIVATE ${CUDAToolkit_INCLUDE_DIRS})
 
+target_link_libraries(CufRuntime
+  PUBLIC
+  flang_rt
+  CUDA::cudart_static
+)

flang-rt/unittests/Runtime/CUDA/CMakeLists.txt

@@ -12,17 +12,7 @@ add_flangrt_unittest(FlangCufRuntimeTests
   Memory.cpp
 )
 
-if (BUILD_SHARED_LIBS)
-  set(CUDA_RT_TARGET CUDA::cudart)
-else()
-  set(CUDA_RT_TARGET CUDA::cudart_static)
-endif()
-
 target_link_libraries(FlangCufRuntimeTests
   PRIVATE
-  ${CUDA_RT_TARGET}
-  CufRuntime_cuda_${CUDAToolkit_VERSION_MAJOR}
-  flang_rt.unittest
+  CufRuntime
 )
-
-target_include_directories(FlangCufRuntimeTests PRIVATE ${CUDAToolkit_INCLUDE_DIRS})