[PATCH] D22861: Remove LLVM_ENABLE_LIBCXXABI

[Jonas Hahnfeld via llvm-commits]

Hahnfeld created this revision.
Hahnfeld added reviewers: chandlerc, EricWF, mclow.lists.
Hahnfeld added a subscriber: llvm-commits.

`libc++.so` is now a linker script that includes `-lc++abi` if necessary.

https://reviews.llvm.org/D22861

Files:
  CMakeLists.txt
  cmake/modules/HandleLLVMStdlib.cmake

Index: cmake/modules/HandleLLVMStdlib.cmake
===================================================================
--- cmake/modules/HandleLLVMStdlib.cmake
+++ cmake/modules/HandleLLVMStdlib.cmake
@@ -20,11 +20,6 @@
         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()
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -316,7 +316,6 @@
 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_PEDANTIC "Compile with pedantic enabled." ON)
 option(LLVM_ENABLE_WERROR "Fail and stop if a warning is triggered." OFF)
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D22861.65729.patch
Type: text/x-patch
Size: 1127 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160727/81e66897/attachment.bin>