[clang] 35367e0 - Revert "[CMake] Explicitly specify paths to libc++abi in CrossWinToARMLinux.cmake"

Sergej Jaskiewicz via cfe-commits cfe-commits at lists.llvm.org
Mon Feb 17 05:06:50 PST 2020


Author: Sergej Jaskiewicz
Date: 2020-02-17T16:06:30+03:00
New Revision: 35367e06b84618e21945674aa22e7cfda1957ea4

URL: https://github.com/llvm/llvm-project/commit/35367e06b84618e21945674aa22e7cfda1957ea4
DIFF: https://github.com/llvm/llvm-project/commit/35367e06b84618e21945674aa22e7cfda1957ea4.diff

LOG: Revert "[CMake] Explicitly specify paths to libc++abi in CrossWinToARMLinux.cmake"

This reverts commit 801627ee490e1106380184256503dbd520c5f802.

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 "")


        


More information about the cfe-commits mailing list