diff options
| author | Stefan Granitz <stefan.graenitz@gmail.com> | 2019-01-11 17:51:33 +0000 |
|---|---|---|
| committer | Stefan Granitz <stefan.graenitz@gmail.com> | 2019-01-11 17:51:33 +0000 |
| commit | dc17ec5cab179ffa0e0950c60f51eea7a1fb8db1 (patch) | |
| tree | 1d01043d5483b881c75960f19007c82a9392b064 /lldb | |
| parent | 500af931db7418f8707f37ca5df07786df5a26cb (diff) | |
[CMake] Remove dead code and outdated comments
Summary: All of these changes are NOPs.
Reviewers: stella.stamenova, labath, JDevlieghere
Reviewed By: stella.stamenova
Subscribers: mgorny, lldb-commits, #lldb
Differential Revision: https://reviews.llvm.org/D56609
Diffstat (limited to 'lldb')
| -rw-r--r-- | lldb/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | lldb/cmake/modules/LLDBStandalone.cmake | 1 | ||||
| -rw-r--r-- | lldb/lit/CMakeLists.txt | 17 |
3 files changed, 2 insertions, 23 deletions
diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt index 38fc949d0c6..55d7f5acd3b 100644 --- a/lldb/CMakeLists.txt +++ b/lldb/CMakeLists.txt @@ -41,13 +41,10 @@ option(LLDB_TEST_USE_CUSTOM_C_COMPILER "Use the C compiler provided via LLDB_TES option(LLDB_TEST_USE_CUSTOM_CXX_COMPILER "Use the C++ compiler provided via LLDB_TEST_CXX_COMPILER for building test inferiors (instead of the just-built compiler). Defaults to OFF." OFF) if(LLDB_INCLUDE_TESTS) - # Set the path to the default lldb test executable. Make the path relative to - # LLVM_RUNTIME_OUTPUT_INTDIR: this will be correct even when LLVM and LLDB - # have separate binary directories. + # Set the path to the default lldb test executable. set(LLDB_DEFAULT_TEST_EXECUTABLE "${LLVM_RUNTIME_OUTPUT_INTDIR}/lldb${CMAKE_EXECUTABLE_SUFFIX}") - # Set the paths to default llvm tools. Make these paths relative to the LLVM - # binary directory. + # Set the paths to default llvm tools. set(LLDB_DEFAULT_TEST_DSYMUTIL "${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/dsymutil${CMAKE_EXECUTABLE_SUFFIX}") set(LLDB_DEFAULT_TEST_FILECHECK "${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/FileCheck${CMAKE_EXECUTABLE_SUFFIX}") diff --git a/lldb/cmake/modules/LLDBStandalone.cmake b/lldb/cmake/modules/LLDBStandalone.cmake index 4381bbec8e6..a196712557c 100644 --- a/lldb/cmake/modules/LLDBStandalone.cmake +++ b/lldb/cmake/modules/LLDBStandalone.cmake @@ -101,7 +101,6 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) # Import CMake library targets from LLVM and Clang. include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm/LLVMConfig.cmake") - # cmake/clang/ClangConfig.cmake is not created when LLVM and Clang are built together. if (EXISTS "${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake") include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake") endif() diff --git a/lldb/lit/CMakeLists.txt b/lldb/lit/CMakeLists.txt index 1c0937caff4..8c75aec731a 100644 --- a/lldb/lit/CMakeLists.txt +++ b/lldb/lit/CMakeLists.txt @@ -11,14 +11,6 @@ if (CMAKE_SIZEOF_VOID_P EQUAL 8) set(LLDB_IS_64_BITS 1) endif() -if (NOT LLDB_TEST_USE_CUSTOM_C_COMPILER) - string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_TEST_C_COMPILER ${LLDB_TEST_C_COMPILER}) -endif () - -if (NOT LLDB_TEST_USE_CUSTOM_CXX_COMPILER) - string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_TEST_CXX_COMPILER ${LLDB_TEST_CXX_COMPILER}) -endif () - get_property(LLDB_DOTEST_ARGS GLOBAL PROPERTY LLDB_DOTEST_ARGS_PROPERTY) string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_LIBS_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) @@ -38,17 +30,8 @@ list(APPEND LLDB_TEST_DEPS if(TARGET lld) list(APPEND LLDB_TEST_DEPS lld) - set(LLDB_HAVE_LLD 1) -else() - set(LLDB_HAVE_LLD 0) endif() -if(BUILD_SHARED_LIBS) - set(ENABLE_SHARED 1) -else() - set(ENABLE_SHARED 0) -endif(BUILD_SHARED_LIBS) - # the value is not canonicalized within LLVM llvm_canonicalize_cmake_booleans( LLDB_DISABLE_PYTHON |