LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[cmake] [libcxx] Fix find_path() problems when cross compiling.

Browse Source 
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
libcxxabi project on the host system, not the target system,
which can be done by passing NO_CMAKE_FIND_ROOT_PATH.

Differential Revision: https://reviews.llvm.org/D41622

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@323143 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Don Hinton
2018-01-22 19:26:38 +00:00
parent c84b496981
commit 65d4ee3df0
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -123,6 +123,7 @@ if (LIBCXX_CXX_ABI STREQUAL "default")
${LLVM_MAIN_SRC_DIR}/runtimes/libcxxabi/include ${LLVM_MAIN_SRC_DIR}/runtimes/libcxxabi/include
${LLVM_MAIN_SRC_DIR}/../libcxxabi/include ${LLVM_MAIN_SRC_DIR}/../libcxxabi/include
NO_DEFAULT_PATH NO_DEFAULT_PATH
NO_CMAKE_FIND_ROOT_PATH
) )
if (LIBCXX_TARGETING_MSVC) if (LIBCXX_TARGETING_MSVC)
# FIXME: Figure out how to configure the ABI library on Windows. # FIXME: Figure out how to configure the ABI library on Windows.