diff options
| -rw-r--r-- | lld/test/lit.cfg.py | 6 | ||||
| -rw-r--r-- | lld/test/lit.site.cfg.py.in | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lld/test/lit.cfg.py b/lld/test/lit.cfg.py index a1c8910dc64..05ebc23869a 100644 --- a/lld/test/lit.cfg.py +++ b/lld/test/lit.cfg.py @@ -78,11 +78,11 @@ config.environment['LLD_IN_TEST'] = '1' # Indirectly check if the mt.exe Microsoft utility exists by searching for # cvtres, which always accompanies it. Alternatively, check if we can use # libxml2 to merge manifests. -if lit.util.which('cvtres', config.environment['PATH']) or \ - config.llvm_libxml2_enabled: +if (lit.util.which('cvtres', config.environment['PATH'])) or \ + (config.llvm_libxml2_enabled == '1'): config.available_features.add('manifest_tool') -if config.llvm_libxml2_enabled: +if (config.llvm_libxml2_enabled == '1'): config.available_features.add('libxml2') tar_executable = lit.util.which('tar', config.environment['PATH']) diff --git a/lld/test/lit.site.cfg.py.in b/lld/test/lit.site.cfg.py.in index 305d5870681..50593f7d01b 100644 --- a/lld/test/lit.site.cfg.py.in +++ b/lld/test/lit.site.cfg.py.in @@ -4,6 +4,7 @@ config.llvm_src_root = "@LLVM_SOURCE_DIR@" config.llvm_obj_root = "@LLVM_BINARY_DIR@" config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" config.llvm_libs_dir = "@LLVM_LIBS_DIR@" +config.llvm_libxml2_enabled = "@LLVM_LIBXML2_ENABLED@" config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@" config.lld_obj_root = "@LLD_BINARY_DIR@" config.lld_libs_dir = "@LLVM_LIBRARY_OUTPUT_INTDIR@" @@ -11,7 +12,6 @@ config.lld_tools_dir = "@LLVM_RUNTIME_OUTPUT_INTDIR@" config.target_triple = "@TARGET_TRIPLE@" config.python_executable = "@PYTHON_EXECUTABLE@" config.have_zlib = @HAVE_LIBZ@ -config.llvm_libxml2_enabled = @LLVM_LIBXML2_ENABLED@ # Support substitution of the tools and libs dirs with user parameters. This is # used when we can't determine the tool dir at configuration time. |
