commit 6b4575de15b3ae1a49ff42797a9ee359401d7938
author Louis Dionne <ldionne@apple.com> Thu Jul 16 06:03:00 2020 -0400
committer Copybara-Service <copybara-worker@google.com> Fri Aug 28 11:17:39 2020 -0700
tree bbab610a3eb148075a0792d3d4b87befe45c3d56
parent 6bc82cde9ef279acd8b4d175d8fea081445189c3

[runtimes][NFC] Remove unused or unnecessary CMake variables

GitOrigin-RevId: 0f03626fbf40ba1a74badf2d1476a550535c184f

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f20893f..b50550d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,13 +182,9 @@
     "${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++)

test/lit.site.cfg.in

diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
index d0f0e08..30a996c 100644
--- a/test/lit.site.cfg.in
+++ b/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@"