[CMake] Stop using c++ subdirectory for libc++ on Win to ARM Linux cross builds. NFC
authorVladimir Vereschaka <vvereschaka@accesssoftek.com>
Thu, 29 Apr 2021 21:19:24 +0000 (14:19 -0700)
committerVladimir Vereschaka <vvereschaka@accesssoftek.com>
Thu, 29 Apr 2021 21:23:33 +0000 (14:23 -0700)
Updated cross Win-x-ARM Linux toolchain cmake cache file in according of
the following changes: https://reviews.llvm.org/D100869

Stop using use c++ subdirectory for libc++ library

clang/cmake/caches/CrossWinToARMLinux.cmake

index b5781a7..8f45603 100644 (file)
@@ -97,7 +97,7 @@ 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            "${LLVM_PROJECT_DIR}/libcxxabi/include" CACHE PATH "")
-set(LIBCXX_CXX_ABI_LIBRARY_PATH             "${CMAKE_BINARY_DIR}/lib/${LIBCXX_TARGET_TRIPLE}/c++" CACHE PATH "")
+set(LIBCXX_CXX_ABI_LIBRARY_PATH             "${CMAKE_BINARY_DIR}/lib/${LIBCXX_TARGET_TRIPLE}" CACHE PATH "")
 set(LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS    ON CACHE BOOL "")
 
 # Set up RPATH for the target runtime/builtin libraries.