This is an archive of the discontinued LLVM Phabricator instance.

Differential D41621

[cmake] [libunwind] Fix find_path() problems when cross compiling
ClosedPublic

Authored by hintonda on Dec 28 2017, 9:32 PM.

Details

Reviewers
EricWF
compnerd
phosek
beanz
Commits
rG82c5878575a0: [cmake] [libunwind] Fix find_path() problems when cross compiling
rUNW323141: [cmake] [libunwind] Fix find_path() problems when cross compiling
rL323141: [cmake] [libunwind] Fix find_path() problems when cross compiling
Summary

When CMAKE_SYSROOT or CMAKE_FIND_ROOT_PATH is set, cmake
recommends setting CMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY
globally which means find_path() always prepends CMAKE_SYSROOT or
CMAKE_FIND_ROOT_PATH to all paths used in the search.

However, this find_path() invocation is looking for a path in the
libcxx project on the host system, not the target system,
which can be done by passing NO_CMAKE_FIND_ROOT_PATH.

Diff Detail

Repository
rL LLVM

Event Timeline

hintonda created this revision.Dec 28 2017, 9:32 PM
Herald added a subscriber: mgorny. · View Herald TranscriptDec 28 2017, 9:32 PM
hintonda retitled this revision from [cmake] Fix path problems when cross compiling. to [cmake] [libunwind] Fix path problems when cross compiling..Dec 28 2017, 9:35 PM
compnerd requested changes to this revision.Dec 29 2017, 3:35 PM

Similar to the libc++abi and libc++ changes.

This revision now requires changes to proceed.Dec 29 2017, 3:35 PM
hintonda added a comment.Jan 6 2018, 7:06 PM

ping...

hintonda added a child revision: D41828: [cmake] Add linux toolchain file..Jan 8 2018, 11:48 AM
hintonda mentioned this in D41829: [cmake] WIP: Add cache file to bootstrap linux cross compile on Darwin..Jan 19 2018, 9:31 PM
hintonda retitled this revision from [cmake] [libunwind] Fix path problems when cross compiling. to [cmake] [libunwind] Fix find_path() problems when cross compiling.Jan 22 2018, 10:54 AM
hintonda edited the summary of this revision. (Show Details)
This revision was not accepted when it landed; it landed in state Needs Revision.Jan 22 2018, 11:18 AM
Closed by commit rL323141: [cmake] [libunwind] Fix find_path() problems when cross compiling (authored by dhinton). · Explain Why
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptJan 22 2018, 11:18 AM

Revision Contents

Diff 130930

libunwind/trunk/CMakeLists.txt

Show First 20 Lines • Show All 323 Lines • ▼ Show 20 Lines
include_directories(include) include_directories(include)
find_path( find_path(
LIBUNWIND_LIBCXX_INCLUDES_INTERNAL LIBUNWIND_LIBCXX_INCLUDES_INTERNAL
__libcpp_version __libcpp_version
PATHS ${LLVM_MAIN_SRC_DIR}/projects/libcxx/include PATHS ${LLVM_MAIN_SRC_DIR}/projects/libcxx/include
${LLVM_MAIN_SRC_DIR}/runtimes/libcxx/include ${LLVM_MAIN_SRC_DIR}/runtimes/libcxx/include
NO_DEFAULT_PATH NO_DEFAULT_PATH
NO_CMAKE_FIND_ROOT_PATH
) )
if ((NOT LIBUNWIND_STANDALONE_BUILD OR HAVE_LIBCXX) AND if ((NOT LIBUNWIND_STANDALONE_BUILD OR HAVE_LIBCXX) AND
IS_DIRECTORY "${LIBUNWIND_LIBCXX_INCLUDES_INTERNAL}") IS_DIRECTORY "${LIBUNWIND_LIBCXX_INCLUDES_INTERNAL}")
set(LIBUNWIND_CXX_INCLUDE_PATHS_DEFAULT "${LIBUNWIND_LIBCXX_INCLUDES_INTERNAL}") set(LIBUNWIND_CXX_INCLUDE_PATHS_DEFAULT "${LIBUNWIND_LIBCXX_INCLUDES_INTERNAL}")
endif() endif()
set(LIBUNWIND_CXX_INCLUDE_PATHS "${LIBUNWIND_CXX_INCLUDE_PATHS_DEFAULT}" CACHE PATH set(LIBUNWIND_CXX_INCLUDE_PATHS "${LIBUNWIND_CXX_INCLUDE_PATHS_DEFAULT}" CACHE PATH
"Paths to C++ header directories separated by ';'.") "Paths to C++ header directories separated by ';'.")
Show All 12 Lines