Revert gold part of change, just liblto

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@289663 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/lit.cfg b/test/lit.cfg
index b572f25ea6da6be1a033a99ef0d626ecf3cae0e5..2c7a9c45ebf60beb8589e5552d1f2fd543937c8a 100644 (file)
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -420,7 +420,7 @@ if config.host_triple == config.target_triple:
 import subprocess
 
 def have_ld_plugin_support():
-    if not config.llvm_tool_llvm_shlib_build:
+    if not os.path.exists(os.path.join(config.llvm_shlib_dir, 'LLVMgold.so')):
         return False
 
     ld_cmd = subprocess.Popen([config.gold_executable, '--help'], stdout = subprocess.PIPE, env={'LANG': 'C'})

diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
index 8b0a3a69530dd528408f13dc2eb04c88e985d1bb..4877f71eef11b6103d63b6bc1562f46f305e673e 100644 (file)
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.in
@@ -15,7 +15,6 @@ config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
 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@"