summaryrefslogtreecommitdiff
path: root/libunwind
diff options
context:
space:
mode:
authorLouis Dionne <ldionne@apple.com>2020-07-16 06:03:00 -0400
committerLouis Dionne <ldionne@apple.com>2020-07-16 10:47:08 -0400
commit0f03626fbf40ba1a74badf2d1476a550535c184f (patch)
treee813f710e86a7e2a03618741aedc0add9dbff3fc /libunwind
parentaca7b8dd63c8be4fc9c301a6079adc04add23c22 (diff)
downloadllvm-0f03626fbf40ba1a74badf2d1476a550535c184f.tar.gz
[runtimes][NFC] Remove unused or unnecessary CMake variables
Diffstat (limited to 'libunwind')
-rw-r--r--libunwind/CMakeLists.txt4
-rw-r--r--libunwind/test/lit.site.cfg.in2
2 files changed, 1 insertions, 5 deletions
diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt
index f20893f4aa86..b50550dc376e 100644
--- a/libunwind/CMakeLists.txt
+++ b/libunwind/CMakeLists.txt
@@ -182,13 +182,9 @@ set(CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
${CMAKE_MODULE_PATH})
-set(LIBUNWIND_COMPILER ${CMAKE_CXX_COMPILER})
set(LIBUNWIND_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(LIBUNWIND_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
-string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION
- ${PACKAGE_VERSION})
-
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++)
set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++)
diff --git a/libunwind/test/lit.site.cfg.in b/libunwind/test/lit.site.cfg.in
index d0f0e08fc926..30a996cf3783 100644
--- a/libunwind/test/lit.site.cfg.in
+++ b/libunwind/test/lit.site.cfg.in
@@ -3,7 +3,7 @@
import os
import site
-config.cxx_under_test = "@LIBUNWIND_COMPILER@"
+config.cxx_under_test = "@CMAKE_CXX_COMPILER@"
config.project_obj_root = "@CMAKE_BINARY_DIR@"
config.libunwind_src_root = "@LIBUNWIND_SOURCE_DIR@"
config.libunwind_obj_root = "@LIBUNWIND_BINARY_DIR@"