2 files changed, 36 insertions, 16 deletions
diff --git a/llvm/utils/llvm-lit/CMakeLists.txt b/llvm/utils/llvm-lit/CMakeLists.txt
index 606d36ccf69..4b10354cfde 100644
--- a/llvm/utils/llvm-lit/CMakeLists.txt
+++ b/llvm/utils/llvm-lit/CMakeLists.txt
@@ -4,8 +4,6 @@ if (WIN32 AND NOT CYGWIN)
 endif ()
 set(llvm_lit_path ${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-lit${suffix})
 
-get_property(LLVM_LIT_CONFIG_MAP GLOBAL PROPERTY LLVM_LIT_CONFIG_MAP)
-
 if(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
   foreach(BUILD_MODE ${CMAKE_CONFIGURATION_TYPES})
     string(REPLACE ${CMAKE_CFG_INTDIR} ${BUILD_MODE} bi ${llvm_lit_path})
diff --git a/llvm/utils/llvm-lit/llvm-lit.in b/llvm/utils/llvm-lit/llvm-lit.in
index efad97ade7e..08a2a670b21 100755
--- a/llvm/utils/llvm-lit/llvm-lit.in
+++ b/llvm/utils/llvm-lit/llvm-lit.in
@@ -3,15 +3,6 @@
 import os
 import sys
 
-config_map = {}
-
-def map_config(source_dir, site_config):
-    global config_map
-    source_dir = os.path.normpath(source_dir)
-    source_dir = os.path.normcase(source_dir)
-    site_config = os.path.normpath(site_config)
-    config_map[source_dir] = site_config
-
 # Variables configured at build time.
 llvm_source_root = "@LLVM_SOURCE_DIR@"
 llvm_obj_root = "@LLVM_BINARY_DIR@"
@@ -21,11 +12,42 @@ sys.path.insert(0, os.path.join(llvm_source_root, 'utils', 'lit'))
 
 # Set up some builtin parameters, so that by default the LLVM test suite
 # configuration file knows how to find the object tree.
-builtin_parameters = { 'build_mode' : "@BUILD_MODE@" }
-
-@LLVM_LIT_CONFIG_MAP@
-
-builtin_parameters['config_map'] = config_map
+builtin_parameters = {
+    'build_mode' : "@BUILD_MODE@",
+    'llvm_site_config' : os.path.join(llvm_obj_root, 'test', 'lit.site.cfg'),
+    'llvm_unit_site_config' : os.path.join(llvm_obj_root, 'test', 'Unit',
+                                           'lit.site.cfg')
+    }
+
+clang_obj_root = os.path.join(llvm_obj_root, 'tools', 'clang')
+
+if os.path.exists(clang_obj_root):
+    builtin_parameters['clang_site_config'] = \
+        os.path.join(clang_obj_root, 'test', 'lit.site.cfg')
+    clang_tools_extra_obj_root = os.path.join(clang_obj_root, 'tools', 'extra')
+    if os.path.exists(clang_tools_extra_obj_root):
+        builtin_parameters['clang_tools_extra_site_config'] = \
+            os.path.join(clang_tools_extra_obj_root, 'test', 'lit.site.cfg')
+
+lld_obj_root = os.path.join(llvm_obj_root, 'tools', 'lld')
+if os.path.exists(lld_obj_root):
+    builtin_parameters['lld_site_config'] = \
+        os.path.join(lld_obj_root, 'test', 'lit.site.cfg')
+
+compilerrt_obj_root = os.path.join(llvm_obj_root, 'projects', 'compiler-rt')
+if os.path.exists(compilerrt_obj_root):
+    builtin_parameters['compilerrt_site_basedir'] = \
+            os.path.join(compilerrt_obj_root, 'test')
+
+libcxx_obj_root = os.path.join(llvm_obj_root, 'projects', 'libcxx')
+if os.path.exists(libcxx_obj_root):
+    builtin_parameters['libcxx_site_config'] = \
+        os.path.join(libcxx_obj_root, 'test', 'lit.site.cfg')
+
+libcxxabi_obj_root = os.path.join(llvm_obj_root, 'projects', 'libcxxabi')
+if os.path.exists(libcxxabi_obj_root):
+    builtin_parameters['libcxxabi_site_config'] = \
+        os.path.join(libcxxabi_obj_root, 'test', 'lit.site.cfg')
 
 if __name__=='__main__':
     from lit.main import main