Post-merge fixes

Author: Meinersbur

flang-rt/cmake/modules/AddFlangRT.cmake

@@ -143,13 +143,13 @@ function (add_flangrt_library name)
     if (build_shared)
       add_library(${name}.default ALIAS ${name_shared})
     else ()
-      add_library(${name}.default ALIAS ${name})
+      add_library(${name}.default ALIAS ${name_static})
     endif ()
   else ()
     if (build_static)
       add_library(${name}.default ALIAS ${name_static})
     else ()
-      add_library(${name}.default ALIAS ${name})
+      add_library(${name}.default ALIAS ${name_shared})
     endif ()
   endif ()
 

flang-rt/lib/flang_rt/CMakeLists.txt

@@ -137,16 +137,10 @@ if (NOT WIN32)
   enable_cuda_compilation(flang_rt.static "${supported_sources}")
   enable_omp_offload_compilation(flang_rt.static "${supported_sources}")
 
-  # Select a default runtime, which is used for unittests.
-  if (TARGET flang_rt.shared AND BUILD_SHARED_LIBS)
-    set(default_flang_rt "flang_rt.shared")
-  elseif (TARGET flang_rt.static)
-    set(default_flang_rt "flang_rt.static")
-  else ()
-    set(default_flang_rt "flang_rt.shared")
-  endif ()
-  add_library(flang_rt ALIAS "${default_flang_rt}")
-  add_library(flang_rt.unittest ALIAS "${default_flang_rt}")
+  # Select a default runtime, which is used for unit and regression tests.
+  get_target_property(default_target flang_rt.default ALIASED_TARGET)
+  add_library(flang_rt ALIAS "${default_target}")
+  add_library(flang_rt.unittest ALIAS "${default_target}")
 else()
   # Target for building all versions of the runtime
   add_custom_target(flang_rt)