From 0197eac3330c04a49519f3e4dac38c4de605c654 Mon Sep 17 00:00:00 2001 From: Sergej Jaskiewicz Date: Mon, 17 Feb 2020 15:22:18 +0300 Subject: [PATCH] Temporarily re-apply https://reviews.llvm.org/D74347 It was reverted in 35367e06b84618e21945674aa22e7cfda1957ea4 because it broke the buildbot due to missing libc++abi headers. https://reviews.llvm.org/D75991 improves the diagnostics, so I hope the build log will be more informative. --- clang/cmake/caches/CrossWinToARMLinux.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake b/clang/cmake/caches/CrossWinToARMLinux.cmake index 50957b153328..7a6af734f0de 100644 --- a/clang/cmake/caches/CrossWinToARMLinux.cmake +++ b/clang/cmake/caches/CrossWinToARMLinux.cmake @@ -83,6 +83,9 @@ set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "") set(LIBCXX_TARGET_TRIPLE "${CMAKE_C_COMPILER_TARGET}" CACHE STRING "") set(LIBCXX_SYSROOT "${DEFAULT_SYSROOT}" CACHE STRING "") set(LIBCXX_ENABLE_SHARED OFF CACHE BOOL "") +set(LIBCXX_CXX_ABI "libcxxabi" CACHE STRING "") +set(LIBCXX_CXX_ABI_INCLUDE_PATHS "${CMAKE_SOURCE_DIR}/../libcxxabi/include" CACHE PATH "") +set(LIBCXX_CXX_ABI_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib/${CMAKE_C_COMPILER_TARGET}/c++" CACHE PATH "") set(BUILTINS_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "") set(RUNTIMES_CMAKE_ARGS "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")