summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Roelofs <jonathan@codesourcery.com>2017-07-26 18:13:57 +0000
committerJonathan Roelofs <jonathan@codesourcery.com>2017-07-26 18:13:57 +0000
commit36c1a03b74e1eddbbc844b08dcf74c94556613ea (patch)
treefda8a89744597904f8752eac370809ad357fbae2
parentf6717c26e1069fbc0894fe8b98022580e875dad1 (diff)
Partial fix for PR33858
https://reviews.llvm.org/D35848 git-svn-id: https://llvm.org/svn/llvm-project/libunwind/trunk@309147 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/CMakeLists.txt1
-rw-r--r--test/lit.site.cfg.in2
2 files changed, 1 insertions, 2 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9673ed7..97917b8 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -16,7 +16,6 @@ pythonize_bool(LIBCXX_ENABLE_SHARED)
pythonize_bool(LIBUNWIND_ENABLE_SHARED)
pythonize_bool(LIBUNWIND_ENABLE_THREADS)
pythonize_bool(LIBUNWIND_ENABLE_EXCEPTIONS)
-pythonize_bool(LIBUNWIND_USE_LLVM_UNWINDER)
pythonize_bool(LIBUNWIND_BUILD_EXTERNAL_THREAD_LIBRARY)
set(LIBUNWIND_TARGET_INFO "libcxx.test.target_info.LocalTI" CACHE STRING
"TargetInfo to use when setting up test environment.")
diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
index d701a65..3ed0c74 100644
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.in
@@ -7,7 +7,7 @@ config.abi_library_path = "@LIBUNWIND_LIBRARY_DIR@"
config.libcxx_src_root = "@LIBUNWIND_LIBCXX_PATH@"
config.libunwind_headers = "@LIBUNWIND_SOURCE_DIR@/include"
config.cxx_library_root = "@LIBUNWIND_LIBCXX_LIBRARY_PATH@"
-config.llvm_unwinder = "@LIBUNWIND_USE_LLVM_UNWINDER@"
+config.llvm_unwinder = "1"
config.enable_threads = "@LIBUNWIND_ENABLE_THREADS@"
config.use_sanitizer = "@LLVM_USE_SANITIZER@"
config.enable_32bit = "@LIBUNWIND_BUILD_32_BITS@"