diff options
author | Jonas Hahnfeld <Hahnfeld@itc.rwth-aachen.de> | 2016-08-04 10:24:48 +0000 |
---|---|---|
committer | Jonas Hahnfeld <Hahnfeld@itc.rwth-aachen.de> | 2016-08-04 10:24:48 +0000 |
commit | 3d88f0c3fb090aa2c72fbbf9f8ecea526911bdda (patch) | |
tree | 57a2c139fd9e6b2e05c3b8967360ff8c2cc600ff | |
parent | 8ae6dad49b4440641073a2ef4001875ebf406352 (diff) | |
download | bcm5719-llvm-3d88f0c3fb090aa2c72fbbf9f8ecea526911bdda.tar.gz bcm5719-llvm-3d88f0c3fb090aa2c72fbbf9f8ecea526911bdda.zip |
Remove LLVM_ENABLE_LIBCXXABI
libc++.so is now a linker script that includes -lc++abi if necessary.
Differential Revision: https://reviews.llvm.org/D22861
llvm-svn: 277714
-rw-r--r-- | llvm/CMakeLists.txt | 1 | ||||
-rw-r--r-- | llvm/cmake/modules/HandleLLVMStdlib.cmake | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 1854e53cf94..c773a707762 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -336,7 +336,6 @@ else() endif() option(LLVM_ENABLE_CXX1Y "Compile with C++1y enabled." OFF) option(LLVM_ENABLE_LIBCXX "Use libc++ if available." OFF) -option(LLVM_ENABLE_LIBCXXABI "Use libc++abi when using libc++." OFF) option(LLVM_ENABLE_LLD "Use lld as C and C++ linker." OFF) option(LLVM_ENABLE_PEDANTIC "Compile with pedantic enabled." ON) option(LLVM_ENABLE_WERROR "Fail and stop if a warning is triggered." OFF) diff --git a/llvm/cmake/modules/HandleLLVMStdlib.cmake b/llvm/cmake/modules/HandleLLVMStdlib.cmake index b07781c3f29..c0512ac34f6 100644 --- a/llvm/cmake/modules/HandleLLVMStdlib.cmake +++ b/llvm/cmake/modules/HandleLLVMStdlib.cmake @@ -20,11 +20,6 @@ if(NOT DEFINED LLVM_STDLIB_HANDLED) append("-stdlib=libc++" CMAKE_CXX_FLAGS CMAKE_EXE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS) - if(LLVM_ENABLE_LIBCXXABI) - append("-lc++abi" - CMAKE_EXE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS - CMAKE_MODULE_LINKER_FLAGS) - endif() else() message(WARNING "Can't specify libc++ with '-stdlib='") endif() |