diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/test/lit.cfg | 4 | ||||
| -rw-r--r-- | llvm/test/lit.site.cfg.in | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/llvm/test/lit.cfg b/llvm/test/lit.cfg index d8728b6d56b..b572f25ea6d 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 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 @@ if have_ld_plugin_support(): 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) diff --git a/llvm/test/lit.site.cfg.in b/llvm/test/lit.site.cfg.in index 1ce3df7dd73..8b0a3a69530 100644 --- a/llvm/test/lit.site.cfg.in +++ b/llvm/test/lit.site.cfg.in @@ -15,6 +15,8 @@ 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@" config.have_ocaml_ounit = "@HAVE_OCAML_OUNIT@" |
