[clang] 74d9a76 - [CMake] Stop using c++ subdirectory for libc++ on Win to ARM Linux cross builds. NFC

[Vladimir Vereschaka via cfe-commits]

Author: Vladimir Vereschaka
Date: 2021-04-29T14:23:33-07:00
New Revision: 74d9a76ad3f55c16982ceaa8b6b4a6b7744109b1

URL: https://github.com/llvm/llvm-project/commit/74d9a76ad3f55c16982ceaa8b6b4a6b7744109b1
DIFF: https://github.com/llvm/llvm-project/commit/74d9a76ad3f55c16982ceaa8b6b4a6b7744109b1.diff

LOG: [CMake] Stop using c++ subdirectory for libc++ on Win to ARM Linux cross builds. NFC

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

Added: 
    

Modified: 
    clang/cmake/caches/CrossWinToARMLinux.cmake

Removed: 
    


################################################################################
diff  --git a/clang/cmake/caches/CrossWinToARMLinux.cmake b/clang/cmake/caches/CrossWinToARMLinux.cmake
index b5781a74498b..8f45603058b9 100644
--- a/clang/cmake/caches/CrossWinToARMLinux.cmake
+++ b/clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -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.