From 63fd07ce07bd700f009edd232db122d2aade895b Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Sat, 19 Jan 2019 00:10:54 +0000 Subject: Use llvm_canonicalize_cmake_booleans for LLVM_LIBXML2_ENABLED [llvm] 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). Also alphabetically sort the list passed to llvm_canonicalize_cmake_booleans() in llvm/test/CMakeLists.txt. No intended behavior change. Differential Revision: https://reviews.llvm.org/D56912 llvm-svn: 351615 --- llvm/utils/gn/TODO.txt | 2 -- llvm/utils/gn/secondary/lld/test/BUILD.gn | 2 +- llvm/utils/gn/secondary/llvm/test/BUILD.gn | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'llvm/utils') diff --git a/llvm/utils/gn/TODO.txt b/llvm/utils/gn/TODO.txt index 15884709f1c..032fe95e6ef 100644 --- a/llvm/utils/gn/TODO.txt +++ b/llvm/utils/gn/TODO.txt @@ -20,8 +20,6 @@ Ideas for things to do: - add dead code stripping - move run_tablegen.py from build to tablegen folder - figure out why -Iclang/Support gets added so often -- make LLVM_LIBXML2_ENABLED use llvm_canonicalize_cmake_boolean (cf D28294), - clean up both GN and CMake builds - plugin() template with working rpath, exports thingers - then port clang_build_examples and enable by default so that clang plugin tests run by default diff --git a/llvm/utils/gn/secondary/lld/test/BUILD.gn b/llvm/utils/gn/secondary/lld/test/BUILD.gn index 6eb80c93563..b62fbc1555e 100644 --- a/llvm/utils/gn/secondary/lld/test/BUILD.gn +++ b/llvm/utils/gn/secondary/lld/test/BUILD.gn @@ -45,7 +45,7 @@ write_lit_cfg("lit_site_cfg") { if (llvm_enable_libxml2) { extra_values += [ "LLVM_LIBXML2_ENABLED=1" ] } else { - extra_values += [ "LLVM_LIBXML2_ENABLED=" ] # Must be empty. + extra_values += [ "LLVM_LIBXML2_ENABLED=0" ] # Must be 0. } if (llvm_enable_zlib) { diff --git a/llvm/utils/gn/secondary/llvm/test/BUILD.gn b/llvm/utils/gn/secondary/llvm/test/BUILD.gn index 2671982a7bb..3c018acbed7 100644 --- a/llvm/utils/gn/secondary/llvm/test/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/test/BUILD.gn @@ -140,7 +140,7 @@ write_lit_config("lit_site_cfg") { if (llvm_enable_libxml2) { extra_values += [ "LLVM_LIBXML2_ENABLED=1" ] } else { - extra_values += [ "LLVM_LIBXML2_ENABLED=" ] # Must be empty. + extra_values += [ "LLVM_LIBXML2_ENABLED=0" ] # Must be 0. } if (llvm_enable_threads) { -- cgit v1.2.3