Merge branch 'users/meinersbur/flang_runtime_flang_rt' into users/meinersbur/flang_runtime_move-files

Author: Meinersbur

flang/CMakeLists.txt

@@ -235,7 +235,6 @@ else()
 endif()
 
 option(FLANG_INCLUDE_RUNTIME "Build the runtime in-tree (deprecated; to be replaced with LLVM_ENABLE_RUNTIMES=flang-rt)" ON)
-pythonize_bool(FLANG_INCLUDE_RUNTIME)
 
 set(FLANG_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
     "Path for binary subdirectory (defaults to '${CMAKE_INSTALL_BINDIR}')")

flang/test/CMakeLists.txt

@@ -126,5 +126,7 @@ if (DEFINED FLANG_TEST_TARGET_TRIPLE)
 endif()
 
 # Compatibility targets.
-add_custom_target(check-flang-rt)
-add_dependencies(check-flang-rt check-flang)
+if (FLANG_INCLUDE_RUNTIME)
+  add_custom_target(check-flang-rt)
+  add_dependencies(check-flang-rt check-flang)
+endif ()

flang/test/lit.site.cfg.py.in

@@ -1,6 +1,7 @@
 @LIT_SITE_CFG_IN_HEADER@
 
 import sys
+import lit.util
 
 config.llvm_tools_dir = lit_config.substitute("@LLVM_TOOLS_DIR@")
 config.llvm_shlib_dir = lit_config.substitute(path(r"@SHLIBDIR@"))
@@ -32,7 +33,7 @@ else:
     config.openmp_module_dir = None
 config.flang_runtime_f128_math_lib = "@FLANG_RUNTIME_F128_MATH_LIB@"
 config.have_ldbl_mant_dig_113 = "@HAVE_LDBL_MANT_DIG_113@"
-config.flang_include_runtime = @FLANG_INCLUDE_RUNTIME@
+config.flang_include_runtime = lit.util.pythonize_bool("@FLANG_INCLUDE_RUNTIME@")
 
 import lit.llvm
 lit.llvm.initialize(lit_config, config)

flang/unittests/Evaluate/CMakeLists.txt

@@ -26,17 +26,15 @@ add_flang_nongtest_unittest(integer
   FortranSemantics
 )
 
-if (FLANG_INCLUDE_RUNTIME)
-  add_flang_nongtest_unittest(intrinsics
-    FortranSupport
-    NonGTestTesting
-    FortranEvaluate
-    FortranDecimal
-    FortranSemantics
-    FortranParser
-    flang_rt
-  )
-endif ()
+add_flang_nongtest_unittest(intrinsics
+  FortranSupport
+  NonGTestTesting
+  FortranEvaluate
+  FortranDecimal
+  FortranSemantics
+  FortranParser
+  flang_rt
+)
 
 add_flang_nongtest_unittest(logical
   NonGTestTesting