Index: llvm/trunk/test/lit.cfg
===================================================================
--- llvm/trunk/test/lit.cfg
+++ llvm/trunk/test/lit.cfg
@@ -420,7 +420,7 @@
 import subprocess
 
 def have_ld_plugin_support():
-    if not os.path.exists(os.path.join(config.llvm_shlib_dir, 'LLVMgold.so')):
+    if not config.llvm_tool_llvm_shlib_build:
         return False
 
     ld_cmd = subprocess.Popen([config.gold_executable, '--help'], stdout = subprocess.PIPE, env={'LANG': 'C'})
@@ -455,7 +455,7 @@
     config.available_features.add('ld_plugin')
 
 def have_ld64_plugin_support():
-    if config.ld64_executable == '':
+    if (not config.llvm_tool_lto_build or config.ld64_executable == ''):
         return False
 
     ld_cmd = subprocess.Popen([config.ld64_executable, '-v'], stderr = subprocess.PIPE)
Index: llvm/trunk/test/lit.site.cfg.in
===================================================================
--- llvm/trunk/test/lit.site.cfg.in
+++ llvm/trunk/test/lit.site.cfg.in
@@ -15,6 +15,8 @@
 config.python_executable = "@PYTHON_EXECUTABLE@"
 config.gold_executable = "@GOLD_EXECUTABLE@"
 config.ld64_executable = "@LD64_EXECUTABLE@"
+config.llvm_tool_llvm_shlib_build = "@LLVM_TOOL_LLVM_SHLIB_BUILD@"
+config.llvm_tool_lto_build = "@LLVM_TOOL_LTO_BUILD@"
 config.ocamlfind_executable = "@OCAMLFIND@"
 config.have_ocamlopt = "@HAVE_OCAMLOPT@"
 config.have_ocaml_ounit = "@HAVE_OCAML_OUNIT@"