[llvm] r277714 - Remove LLVM_ENABLE_LIBCXXABI

[Jonas Hahnfeld via llvm-commits]

Author: hahnfeld
Date: Thu Aug  4 05:24:48 2016
New Revision: 277714

URL: http://llvm.org/viewvc/llvm-project?rev=277714&view=rev
Log:
Remove LLVM_ENABLE_LIBCXXABI

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

Differential Revision: https://reviews.llvm.org/D22861

Modified:
    llvm/trunk/CMakeLists.txt
    llvm/trunk/cmake/modules/HandleLLVMStdlib.cmake

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=277714&r1=277713&r2=277714&view=diff
==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Thu Aug  4 05:24:48 2016
@@ -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)

Modified: llvm/trunk/cmake/modules/HandleLLVMStdlib.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/HandleLLVMStdlib.cmake?rev=277714&r1=277713&r2=277714&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/HandleLLVMStdlib.cmake (original)
+++ llvm/trunk/cmake/modules/HandleLLVMStdlib.cmake Thu Aug  4 05:24:48 2016
@@ -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()