Author: Vladimir Vereschaka Date: 2020-03-11T15:00:56-07:00 New Revision: 828fe7916f91fb7aed5e711bfeb1a30ad197a2c3
URL: https://github.com/llvm/llvm-project/commit/828fe7916f91fb7aed5e711bfeb1a30ad197a2c3 DIFF: https://github.com/llvm/llvm-project/commit/828fe7916f91fb7aed5e711bfeb1a30ad197a2c3.diff LOG: Revert "Temporarily re-apply https://reviews.llvm.org/D74347"; This reverts commit 0197eac3330c04a49519f3e4dac38c4de605c654. The changes break Armv7/Aarch64 toolchain builders: * http://lab.llvm.org:8011/builders/llvm-clang-win-x-armv7l/builds/5570 * http://lab.llvm.org:8011/builders/llvm-clang-win-x-aarch64/builds/5600 Added: Modified: clang/cmake/caches/CrossWinToARMLinux.cmake Removed: ################################################################################ diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake b/clang/cmake/caches/CrossWinToARMLinux.cmake index 7a6af734f0de..50957b153328 100644 --- a/clang/cmake/caches/CrossWinToARMLinux.cmake +++ b/clang/cmake/caches/CrossWinToARMLinux.cmake @@ -83,9 +83,6 @@ 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 "") _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
