diff options
| author | Derek Schuff <dschuff@google.com> | 2016-12-14 16:20:25 +0000 |
|---|---|---|
| committer | Derek Schuff <dschuff@google.com> | 2016-12-14 16:20:25 +0000 |
| commit | 112b3039056b86f163825df14591f5af83e1a05f (patch) | |
| tree | 6ad9ad4ebadf654c9d3d6b787568c004ef720230 | |
| parent | 0c2796dc3660faac2e36c2aa8b13e5cf493c1708 (diff) | |
| download | bcm5719-llvm-112b3039056b86f163825df14591f5af83e1a05f.tar.gz bcm5719-llvm-112b3039056b86f163825df14591f5af83e1a05f.zip | |
Revert gold part of change, just liblto
llvm-svn: 289663
| -rw-r--r-- | llvm/test/lit.cfg | 2 | ||||
| -rw-r--r-- | llvm/test/lit.site.cfg.in | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/llvm/test/lit.cfg b/llvm/test/lit.cfg index b572f25ea6d..2c7a9c45ebf 100644 --- a/llvm/test/lit.cfg +++ b/llvm/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/llvm/test/lit.site.cfg.in b/llvm/test/lit.site.cfg.in index 8b0a3a69530..4877f71eef1 100644 --- a/llvm/test/lit.site.cfg.in +++ b/llvm/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@" |
