From dfadb74f2516067cf697c9958eb9f295bedd4eae Mon Sep 17 00:00:00 2001
From: serge-sans-paille <sguelton@redhat.com>
Date: Fri, 3 Jan 2020 15:39:28 +0100
Subject: [PATCH] Use llvm_canonicalize_cmake_booleans where intended

Differential Revision: https://reviews.llvm.org/D72130
---
 llvm/test/CMakeLists.txt     | 1 +
 llvm/test/lit.site.cfg.py.in | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/llvm/test/CMakeLists.txt b/llvm/test/CMakeLists.txt
index 7a8b51e2d69e..e15dbb11e754 100644
--- a/llvm/test/CMakeLists.txt
+++ b/llvm/test/CMakeLists.txt
@@ -14,6 +14,7 @@ llvm_canonicalize_cmake_booleans(
   LLVM_USE_INTEL_JITEVENTS
   LLVM_BUILD_EXAMPLES
   LLVM_ENABLE_PLUGINS
+  LLVM_BYE_LINK_INTO_TOOLS
   )
 
 configure_lit_site_cfg(
diff --git a/llvm/test/lit.site.cfg.py.in b/llvm/test/lit.site.cfg.py.in
index 0f5e09b6cdaa..b872a8a0a6ed 100644
--- a/llvm/test/lit.site.cfg.py.in
+++ b/llvm/test/lit.site.cfg.py.in
@@ -2,9 +2,6 @@
 
 import sys
 
-def cmake_bool(val):
-    return val.lower() in (1, "on", "yes", "true", "y",)
-
 config.host_triple = "@LLVM_HOST_TRIPLE@"
 config.target_triple = "@TARGET_TRIPLE@"
 config.llvm_src_root = "@LLVM_SOURCE_DIR@"
@@ -50,7 +47,7 @@ config.host_arch = "@HOST_ARCH@"
 config.have_opt_viewer_modules = @LLVM_HAVE_OPT_VIEWER_MODULES@
 config.libcxx_used = @LLVM_LIBCXX_USED@
 config.has_plugins = @LLVM_ENABLE_PLUGINS@
-config.linked_bye_extension = cmake_bool("@LLVM_BYE_LINK_INTO_TOOLS@")
+config.linked_bye_extension = @LLVM_BYE_LINK_INTO_TOOLS@
 
 # Support substitution of the tools_dir with user parameters. This is
 # used when we can't determine the tool dir at configuration time.