Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-02-20 18:27:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Use llvm_canonicalize_cmake_booleans for LLVM_LIBXML2_ENABLED [lld]

Browse Source 
r291284 added a nice mechanism to consistently pass CMake on/off toggles to
lit. This change uses it for LLVM_LIBXML2_ENABLED too (which was added around
the same time and doesn't use the new system yet).

No intended behavior change.

Differential Revision: https://reviews.llvm.org/D56912

llvm-svn: 351614
This commit is contained in:
Nico Weber 2019-01-19 00:09:43 +00:00
parent 8e7600dc43
commit b166d7e725
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lld/test/CMakeLists.txt
View File

@ -14,7 +14,9 @@ if(LLD_BUILT_STANDALONE)
endif()
llvm_canonicalize_cmake_booleans(
HAVE_LIBZ)
HAVE_LIBZ
LLVM_LIBXML2_ENABLED
)
configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in

6
lld/test/lit.cfg.py
View File

@ -87,11 +87,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 == '1'):
if (lit.util.which('cvtres', config.environment['PATH']) or
config.llvm_libxml2_enabled):
config.available_features.add('manifest_tool')
if (config.llvm_libxml2_enabled == '1'):
if config.llvm_libxml2_enabled:
config.available_features.add('libxml2')
if config.have_dia_sdk:

2
lld/test/lit.site.cfg.py.in
View File

@ -7,7 +7,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.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@"