This is an archive of the discontinued LLVM Phabricator instance.

Differential D64959

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

Authored by lanza on Jul 18 2019, 4:08 PM.

Details

Reviewers
xiaobai
Commits
rG79d4fef4977d: Merging r366513: --------------------------------------------------------------…
rL368268: Merging r366513:
rG01eb3ab70c98: [cmake] Update NATIVE build variables to account for standalone changes
rLLDB366513: [cmake] Update NATIVE build variables to account for standalone changes
rL366513: [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.

Diff Detail

Event Timeline

lanza created this revision.Jul 18 2019, 4:08 PM
Herald added a subscriber: mgorny. · View Herald TranscriptJul 18 2019, 4:08 PM
Harbormaster completed remote builds in B35315: Diff 210700.Jul 18 2019, 4:09 PM
lanza added a reviewer: xiaobai.Jul 18 2019, 4:10 PM
xiaobai accepted this revision.Jul 18 2019, 4:37 PM

LGTM

This revision is now accepted and ready to land.Jul 18 2019, 4:37 PM
Closed by commit rL366513: [cmake] Update NATIVE build variables to account for standalone changes (authored by lanza). · Explain WhyJul 18 2019, 4:40 PM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptJul 18 2019, 4:40 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
hans added a subscriber: hans.Aug 8 2019, 1:41 AM

Merged to release_90 in r368268.

Revision Contents

PathSize
9 lines

Diff 210700

CMakeLists.txt

Show All 36 Lines
if (NOT LLDB_DISABLE_PYTHON) if (NOT LLDB_DISABLE_PYTHON)
add_subdirectory(scripts) add_subdirectory(scripts)
endif () endif ()
if(CMAKE_CROSSCOMPILING AND LLDB_BUILT_STANDALONE) if(CMAKE_CROSSCOMPILING AND LLDB_BUILT_STANDALONE)
set(LLVM_USE_HOST_TOOLS ON) set(LLVM_USE_HOST_TOOLS ON)
include(CrossCompile) include(CrossCompile)
if (NOT LLDB_PATH_TO_NATIVE_LLVM_BUILD OR if (NOT NATIVE_LLVM_DIR OR NOT NATIVE_Clang_DIR)
NOT LLDB_PATH_TO_NATIVE_CLANG_BUILD)
message(FATAL_ERROR 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.") for building the native lldb-tblgen used during the build process.")
endif() endif()
llvm_create_cross_target(lldb NATIVE "" Release llvm_create_cross_target(lldb NATIVE "" Release
-DLLDB_PATH_TO_LLVM_BUILD=${LLDB_PATH_TO_NATIVE_LLVM_BUILD} -DLLVM_DIR=${NATIVE_LLVM_DIR}
-DLLDB_PATH_TO_CLANG_BUILD=${LLDB_PATH_TO_NATIVE_CLANG_BUILD}) -DClang_DIR=${NATIVE_Clang_DIR})
endif() endif()
add_subdirectory(utils/TableGen) add_subdirectory(utils/TableGen)
add_subdirectory(source) add_subdirectory(source)
add_subdirectory(tools) add_subdirectory(tools)
add_subdirectory(docs) add_subdirectory(docs)
option(LLDB_INCLUDE_TESTS "Generate build targets for the LLDB unit tests." ${LLVM_INCLUDE_TESTS}) option(LLDB_INCLUDE_TESTS "Generate build targets for the LLDB unit tests." ${LLVM_INCLUDE_TESTS})
▲ Show 20 Lines • Show All 178 Lines • Show Last 20 Lines