From 3d88f0c3fb090aa2c72fbbf9f8ecea526911bdda Mon Sep 17 00:00:00 2001 From: Jonas Hahnfeld Date: Thu, 4 Aug 2016 10:24:48 +0000 Subject: [PATCH] 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 --- llvm/CMakeLists.txt | 1 - llvm/cmake/modules/HandleLLVMStdlib.cmake | 5 ----- 2 files changed, 6 deletions(-) diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 1854e53..c773a70 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 b07781c..c0512ac3 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() -- 2.7.4