This is an archive of the discontinued LLVM Phabricator instance.

Differential D20344

[LLDB] Fix standalone LLDB build when LLVM/Clang were built with LLVM_INSTALL_TOOLCHAIN_ONLY=ON
ClosedPublic

Authored by Eugene.Zelenko on May 17 2016, 4:18 PM.

Details

Reviewers
krytarowski
zturner
labath
Commits
rG000752f1719b: Fix standalone LLDB build, when LLVM/Clang were built with…
rLLDB269996: Fix standalone LLDB build, when LLVM/Clang were built with…
rL269996: Fix standalone LLDB build, when LLVM/Clang were built with…
Summary

Patch also includes fix for CMake 2.8.12.2, see D18018.

Diff Detail

Repository
rL LLVM

Event Timeline

Eugene.Zelenko updated this revision to Diff 57539.May 17 2016, 4:18 PM
Eugene.Zelenko retitled this revision from to [LLDB] Fix standalone LLDB build when LLVM/Clang were built with LLVM_INSTALL_TOOLCHAIN_ONLY=ON.
Eugene.Zelenko updated this object.
Eugene.Zelenko added reviewers: labath, krytarowski, zturner.
Eugene.Zelenko set the repository for this revision to rL LLVM.
Eugene.Zelenko mentioned this in D18018: [LLDB] Fix standalone build with CMake 2.8.12.2, broken after adding SymbolFile PDB plugin.
Eugene.Zelenko added a subscriber: lldb-commits.
labath accepted this revision.May 18 2016, 2:26 AM
labath edited edge metadata.

Looks reasonable to me. Let's give others a chance to respond though.

cmake/modules/LLDBStandalone.cmake
103

Please add a comment about when do we expect this files to exist. (I.e., when building against clang which was configured and built together with llvm).

113

Please add a comment about when do we expect these files to exist. (I.e., when building against an not-installed copy of llvm which is still sitting in its build directory).

This revision is now accepted and ready to land.May 18 2016, 2:26 AM
Eugene.Zelenko updated this revision to Diff 57648.May 18 2016, 10:37 AM
Eugene.Zelenko edited edge metadata.

Add comments per Pavel suggestion.

krytarowski edited edge metadata.May 18 2016, 3:25 PM

I'm going to test it now.

krytarowski accepted this revision.May 18 2016, 3:48 PM
krytarowski edited edge metadata.

It works for me.

Closed by commit rL269996: Fix standalone LLDB build, when LLVM/Clang were built with… (authored by eugenezelenko). · Explain WhyMay 18 2016, 3:56 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
cmake/
modules/
17 lines

Diff 57539

cmake/modules/LLDBStandalone.cmake

Context not available.
project(lldb) project(lldb)
cmake_minimum_required(VERSION 2.8.12.2) cmake_minimum_required(VERSION 2.8.12.2)
if (POLICY CMP0022)
cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required
endif()
option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF) option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF)
# Rely on llvm-config. # Rely on llvm-config.
Context not available.
# Import CMake library targets from LLVM and Clang. # Import CMake library targets from LLVM and Clang.
include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm/LLVMConfig.cmake") include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm/LLVMConfig.cmake")
include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake") if (EXISTS "${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")
labathUnsubmitted
Not Done
ReplyInline Actions

Please add a comment about when do we expect this files to exist. (I.e., when building against clang which was configured and built together with llvm).

labath: Please add a comment about when do we expect this files to exist. (I.e., when building against…
include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")
endif()
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}") set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
Context not available.
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
include_directories("${LLVM_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}") include_directories("${LLVM_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}")
if (EXISTS "${LLVM_OBJ_ROOT}/include")
labathUnsubmitted
Not Done
ReplyInline Actions

Please add a comment about when do we expect these files to exist. (I.e., when building against an not-installed copy of llvm which is still sitting in its build directory).

labath: Please add a comment about when do we expect these files to exist. (I.e., when building against…
include_directories("${LLVM_OBJ_ROOT}/include")
endif()
if (EXISTS "${LLVM_MAIN_SRC_DIR}/tools/clang/include")
include_directories("${LLVM_MAIN_SRC_DIR}/tools/clang/include")
endif()
if (EXISTS "${LLVM_OBJ_ROOT}/tools/clang/include")
include_directories("${LLVM_OBJ_ROOT}/tools/clang/include")
endif()
link_directories("${LLVM_LIBRARY_DIR}") link_directories("${LLVM_LIBRARY_DIR}")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
Context not available.