libc++abi: remove build infrastructure for unwind
authorSaleem Abdulrasool <compnerd@compnerd.org>
Sat, 25 Apr 2015 01:46:29 +0000 (01:46 +0000)
committerSaleem Abdulrasool <compnerd@compnerd.org>
Sat, 25 Apr 2015 01:46:29 +0000 (01:46 +0000)
This removes the libunwind build infrastructure as libunwind is gaining its own
CMakeLists.txt.  The removal must occur first due to the multiple definitions of
the same target.

llvm-svn: 235794

libcxxabi/CMakeLists.txt

index 90e0e37..121b468 100644 (file)
@@ -300,16 +300,14 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBCXXABI_C_FLAGS}")
 #===============================================================================
 
 include_directories(include)
-include_directories(../libunwind/include)
+if (LIBCXXABI_USE_LLVM_UNWINDER)
+  include_directories(${LLVM_MAIN_SRC_DIR}/projects/libunwind/include)
+endif ()
 
 # Add source code. This also contains all of the logic for deciding linker flags
 # soname, etc...
 add_subdirectory(src)
 
-if (LIBCXXABI_USE_LLVM_UNWINDER)
-  add_subdirectory(../libunwind/src "${CMAKE_CURRENT_BINARY_DIR}/libunwind")
-endif()
-
 if(NOT LIBCXXABI_ENABLE_SHARED)
   # TODO: Fix the libc++ cmake files so that libc++abi can be statically linked.
   # As it is now, libc++ will prefer linking against a dynamic libc++abi in the