Skip to content

Commit

Permalink
Merging r366513:
Browse files Browse the repository at this point in the history
------------------------------------------------------------------------
r366513 | lanza | 2019-07-19 01:40:23 +0200 (Fri, 19 Jul 2019) | 9 lines

[cmake] Update NATIVE build variables to account for standalone changes

Summary:
LLDB_PATH_TO_{CLANG,LLVM}_BUILD were removed and replaced with
{LLVM,Clang}_DIR. Adjust the NATIVE build to account for this.

Subscribers: mgorny

Differential Revision: https://reviews.llvm.org/D64959
------------------------------------------------------------------------

llvm-svn: 368268
  • Loading branch information
zmodem committed Aug 8, 2019
1 parent 1cda5ae commit 79d4fef
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions lldb/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,14 @@ endif ()
if(CMAKE_CROSSCOMPILING AND LLDB_BUILT_STANDALONE)
set(LLVM_USE_HOST_TOOLS ON)
include(CrossCompile)
if (NOT LLDB_PATH_TO_NATIVE_LLVM_BUILD OR
NOT LLDB_PATH_TO_NATIVE_CLANG_BUILD)
if (NOT NATIVE_LLVM_DIR OR NOT NATIVE_Clang_DIR)
message(FATAL_ERROR
"Crosscompiling standalone requires the variables LLDB_PATH_TO_NATIVE_{CLANG,LLVM}_BUILD
"Crosscompiling standalone requires the variables NATIVE_{CLANG,LLVM}_DIR
for building the native lldb-tblgen used during the build process.")
endif()
llvm_create_cross_target(lldb NATIVE "" Release
-DLLDB_PATH_TO_LLVM_BUILD=${LLDB_PATH_TO_NATIVE_LLVM_BUILD}
-DLLDB_PATH_TO_CLANG_BUILD=${LLDB_PATH_TO_NATIVE_CLANG_BUILD})
-DLLVM_DIR=${NATIVE_LLVM_DIR}
-DClang_DIR=${NATIVE_Clang_DIR})
endif()

add_subdirectory(utils/TableGen)
Expand Down

0 comments on commit 79d4fef

Please sign in to comment.