[libcxx-commits] [libcxxabi] r359805 - [gn] Support for building libcxxabi

Petr Hosek via libcxx-commits libcxx-commits at lists.llvm.org
Thu May 2 10:29:39 PDT 2019


Author: phosek
Date: Thu May  2 10:29:39 2019
New Revision: 359805

URL: http://llvm.org/viewvc/llvm-project?rev=359805&view=rev
Log:
[gn] Support for building libcxxabi

This change introduces support for building libcxxabi. The library
build should be complete, but not all CMake options have been
replicated in GN. We also don't support tests yet.

We only support two stage build at the moment.

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

Modified:
    libcxxabi/trunk/CMakeLists.txt
    libcxxabi/trunk/src/CMakeLists.txt

Modified: libcxxabi/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/CMakeLists.txt?rev=359805&r1=359804&r2=359805&view=diff
==============================================================================
--- libcxxabi/trunk/CMakeLists.txt (original)
+++ libcxxabi/trunk/CMakeLists.txt Thu May  2 10:29:39 2019
@@ -451,9 +451,7 @@ set(LIBCXXABI_LIBUNWIND_PATH "${LIBCXXAB
 
 include_directories(include)
 if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_NATIVE_ARCH MATCHES ARM)
-  find_path(
-    LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL
-    libunwind.h
+  find_path(LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL libunwind.h
     PATHS ${LIBCXXABI_LIBUNWIND_INCLUDES}
           ${LIBCXXABI_LIBUNWIND_PATH}/include
           ${CMAKE_BINARY_DIR}/${LIBCXXABI_LIBUNWIND_INCLUDES}

Modified: libcxxabi/trunk/src/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/CMakeLists.txt?rev=359805&r1=359804&r2=359805&view=diff
==============================================================================
--- libcxxabi/trunk/src/CMakeLists.txt (original)
+++ libcxxabi/trunk/src/CMakeLists.txt Thu May  2 10:29:39 2019
@@ -25,17 +25,23 @@ if (LIBCXXABI_ENABLE_NEW_DELETE_DEFINITI
 endif()
 
 if (LIBCXXABI_ENABLE_EXCEPTIONS)
-  list(APPEND LIBCXXABI_SOURCES cxa_exception.cpp)
-  list(APPEND LIBCXXABI_SOURCES cxa_personality.cpp)
+  list(APPEND LIBCXXABI_SOURCES
+    cxa_exception.cpp
+    cxa_personality.cpp
+  )
 else()
-  list(APPEND LIBCXXABI_SOURCES cxa_noexception.cpp)
+  list(APPEND LIBCXXABI_SOURCES
+    cxa_noexception.cpp
+  )
 endif()
 
 if (LIBCXXABI_ENABLE_THREADS AND (UNIX OR FUCHSIA) AND NOT (APPLE OR CYGWIN))
   list(APPEND LIBCXXABI_SOURCES cxa_thread_atexit.cpp)
 endif()
 
-set(LIBCXXABI_HEADERS ../include/cxxabi.h)
+set(LIBCXXABI_HEADERS
+  ../include/cxxabi.h
+)
 
 # Add all the headers to the project for IDEs.
 if (MSVC_IDE OR XCODE)




More information about the libcxx-commits mailing list