Post-merge fixes

Author: Meinersbur

flang-rt/cmake/modules/AddFlangRT.cmake

@@ -142,8 +142,8 @@ function (add_flangrt_library name)
     add_library("${name_shared}" SHARED ${extra_args} ${ARG_ADDITIONAL_HEADERS} ${ARG_UNPARSED_ARGUMENTS})
   endif ()
 
-  # Provide a default target if building both and which exists in either setting.
   if (libtargets)
+    # Provide a default alias which exists in either setting.
     if (BUILD_SHARED_LIBS)
       if (build_shared)
         set(default_target "${name_shared}")
@@ -158,8 +158,14 @@ function (add_flangrt_library name)
       endif ()
     endif ()
     add_library(${name}.default ALIAS "${default_target}")
+
+    # Provide a build target that builds any enabled library.
+    # Not intended for target_link_libraries. Either use the ${name}.static,
+    # ${name}.shared variants, or ${name}.default to let BUILD_SHARED_LIBS
+    # decide.
     if (NOT TARGET ${name})
-      add_library(${name} ALIAS "${default_target}")
+      add_custom_target(${name})
+      add_dependencies(${name} ${libtargets})
     endif ()
   endif ()
 

flang-rt/examples/ExternalHelloWorld/CMakeLists.txt

@@ -13,5 +13,5 @@ add_llvm_example(external-hello-world
 
 target_link_libraries(external-hello-world
   PRIVATE
-    flang_rt.runtime
+    flang_rt.runtime.default
   )

flang-rt/lib/cuda/CMakeLists.txt

@@ -27,16 +27,16 @@ add_flangrt_library(flang_rt.cuda STATIC SHARED
 
 # For the static library, link-in the static dependencies as well.
 if (TARGET flang_rt.cuda.static)
-  target_link_libraries(flang.cuda.static PUBLIC
+  target_link_libraries(flang_rt.cuda.static PUBLIC
     flang_rt.runtime.static
     CUDA::cudart_static
   )
 endif ()
 
 # For the shared library, use the shared versions of the dependencies.
 if (TARGET flang_rt.cuda.shared)
-  target_link_libraries(CufRuntime.shared PUBLIC
-    flang_rt.shared
+  target_link_libraries(flang_rt.cuda.shared PUBLIC
+    flang_rt.runtime.shared
     CUDA::cudart
   )
 endif ()

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

@@ -14,5 +14,5 @@ add_flangrt_unittest(FlangCufRuntimeTests
 
 target_link_libraries(FlangCufRuntimeTests
   PRIVATE
-  flang_rt.cuda
+  flang_rt.cuda.default
 )