commit b28832b6bb8e82b2c8adc3a144433ff5f2d9234e
author Louis Dionne <ldionne@apple.com> Thu Jul 16 06:03:00 2020 -0400
committer Copybara-Service <copybara-worker@google.com> Fri Aug 28 01:07:18 2020 -0700
tree 443c3b96b46bb946273c836b0c11bc3f42f3d12b
parent 252bc9b573f9f52bba7a09862741ef7c7bb2520f

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

GitOrigin-RevId: 0f03626fbf40ba1a74badf2d1476a550535c184f

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8881a50..e4e20d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,13 +151,9 @@
   ${CMAKE_MODULE_PATH}
   )
 
-set(LIBCXXABI_COMPILER    ${CMAKE_CXX_COMPILER})
 set(LIBCXXABI_SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR})
 set(LIBCXXABI_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(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++)
   set(LIBCXXABI_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 75fde7e..06d5706 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           = "@LIBCXXABI_COMPILER@"
+config.cxx_under_test           = "@CMAKE_CXX_COMPILER@"
 config.project_obj_root         = "@CMAKE_BINARY_DIR@"
 config.libcxxabi_src_root       = "@LIBCXXABI_SOURCE_DIR@"
 config.libcxxabi_obj_root       = "@LIBCXXABI_BINARY_DIR@"