Use find_compiler_rt_library

Author: Meinersbur

flang-rt/CMakeLists.txt

@@ -160,19 +160,9 @@ check_cxx_source_compiles(
   HAVE_DECL_STRERROR_S)
 
 
-# Search for clang_rt.builtins library.
+# Search for clang_rt.builtins library. Need in addition to msvcrt.
 if (WIN32)
-  execute_process(
-      COMMAND "${CMAKE_CXX_COMPILER}" "-print-libgcc-file-name" "-rtlib=compiler-rt"
-      RESULT_VARIABLE CXX_COMPILER_PRINT_LIBGCC_PATH_FAILURE
-      OUTPUT_VARIABLE CXX_COMPILER_PRINT_LIBGCC_PATH_RESULT
-      ERROR_QUIET
-    )
-  if (NOT CXX_COMPILER_PRINT_LIBGCC_PATH_FAILURE AND CXX_COMPILER_PRINT_LIBGCC_PATH_RESULT)
-    string(STRIP "${CXX_COMPILER_PRINT_LIBGCC_PATH_RESULT}" FLANG_RT_LIBCALL)
-  else ()
-    set(FLANG_RT_LIBCALL "")
-  endif ()
+  find_compiler_rt_library(builtins FLANG_RT_BUILTINS_LIBRARY)
 endif ()
 
 

flang-rt/cmake/modules/AddFlangRT.cmake

@@ -125,8 +125,8 @@ function (add_flangrt_library name)
   # functions in some cases like 128-bit integer math (__udivti3, __modti3,
   # __fixsfti, __floattidf, ...) that msvc does not support. We are injecting a
   # dependency to Compiler-RT's builtin library where these are implemented.
-  if (MSVC AND (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang") AND FLANG_RT_LIBCALL)
-    target_compile_options(${name} PRIVATE "$<$<COMPILE_LANGUAGE:CXX,C>:-Xclang>$<$<COMPILE_LANGUAGE:Fortran>:-Xflang>" "--dependent-lib=${FLANG_RT_LIBCALL}")
+  if (MSVC AND (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang") AND FLANG_RT_BUILTINS_LIBRARY)
+    target_compile_options(${name} PRIVATE "$<$<COMPILE_LANGUAGE:CXX,C>:-Xclang>$<$<COMPILE_LANGUAGE:Fortran>:-Xflang>" "--dependent-lib=${FLANG_RT_BUILTINS_LIBRARY}")
   endif ()
 
   # Non-GTest unittests depend on LLVMSupport