diff options
| author | Stefan Granitz <stefan.graenitz@gmail.com> | 2019-01-09 16:25:37 +0000 |
|---|---|---|
| committer | Stefan Granitz <stefan.graenitz@gmail.com> | 2019-01-09 16:25:37 +0000 |
| commit | 71687793d980359ef3bd019ab4a3f770fba686b6 (patch) | |
| tree | f820df41d69a4d959cb3c66c9291d8c46366f86e /lldb | |
| parent | 345a9c90e3ad7b5654f9c7d93c5ff33d646d0f93 (diff) | |
[CMake] In standalone builds, LLVM_BINARY_DIR should point to LLVM's binary directory
Summary: In standalone builds `LLVM_BINARY_DIR` was equal to `LLDB_BINARY_DIR` so far. This is counterintuitive and invalidated the values of `LLDB_DEFAULT_TEST_DSYMUTIL/FILECHECK/COMPILER` etc.
Reviewers: zturner, labath, clayborg, JDevlieghere, stella.stamenova, serge-sans-paille
Reviewed By: labath
Subscribers: mgorny, friss, lldb-commits, #lldb
Differential Revision: https://reviews.llvm.org/D56443
Diffstat (limited to 'lldb')
| -rw-r--r-- | lldb/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lldb/cmake/modules/LLDBStandalone.cmake | 4 | ||||
| -rw-r--r-- | lldb/lit/Suite/lit.site.cfg.in | 2 | ||||
| -rw-r--r-- | lldb/lit/Unit/lit.site.cfg.py.in | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt index 13032d4f585..38fc949d0c6 100644 --- a/lldb/CMakeLists.txt +++ b/lldb/CMakeLists.txt @@ -110,7 +110,7 @@ if(LLDB_INCLUDE_TESTS) # FIXME: Standalone builds should import the cxx target as well. if(LLDB_BUILT_STANDALONE) # For now check that the include directory exists. - set(cxx_dir "${LLVM_DIR}/../../../include/c++") + set(cxx_dir "${LLVM_BINARY_DIR}/include/c++") if(NOT EXISTS ${cxx_dir}) message(WARNING "LLDB test suite requires libc++ in llvm/projects/libcxx or an existing build symlinked to ${cxx_dir}") endif() diff --git a/lldb/cmake/modules/LLDBStandalone.cmake b/lldb/cmake/modules/LLDBStandalone.cmake index e74bcd6eec9..4381bbec8e6 100644 --- a/lldb/cmake/modules/LLDBStandalone.cmake +++ b/lldb/cmake/modules/LLDBStandalone.cmake @@ -108,10 +108,8 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}") - set(LLVM_BINARY_DIR ${CMAKE_BINARY_DIR}) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - include_directories("${LLVM_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}") + include_directories("${CMAKE_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}") # Next three include directories are needed when llvm-config is located in build directory. # LLVM and Clang are assumed to be built together if (EXISTS "${LLVM_OBJ_ROOT}/include") diff --git a/lldb/lit/Suite/lit.site.cfg.in b/lldb/lit/Suite/lit.site.cfg.in index 93cfd3ffb03..1a24f8c24c2 100644 --- a/lldb/lit/Suite/lit.site.cfg.in +++ b/lldb/lit/Suite/lit.site.cfg.in @@ -1,6 +1,6 @@ @LIT_SITE_CFG_IN_HEADER@ -config.test_exec_root = "@LLVM_BINARY_DIR@" +config.test_exec_root = "@LLDB_BINARY_DIR@" config.llvm_src_root = "@LLVM_SOURCE_DIR@" config.llvm_obj_root = "@LLVM_BINARY_DIR@" config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" diff --git a/lldb/lit/Unit/lit.site.cfg.py.in b/lldb/lit/Unit/lit.site.cfg.py.in index a2d22a69d3f..0c629fdfaa5 100644 --- a/lldb/lit/Unit/lit.site.cfg.py.in +++ b/lldb/lit/Unit/lit.site.cfg.py.in @@ -1,6 +1,6 @@ @LIT_SITE_CFG_IN_HEADER@ -config.test_exec_root = "@LLVM_BINARY_DIR@" +config.test_exec_root = "@LLDB_BINARY_DIR@" config.llvm_src_root = "@LLVM_SOURCE_DIR@" config.llvm_obj_root = "@LLVM_BINARY_DIR@" config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" |