[libcxxabi] r285107 - Get libc++abi building with LLVM_ENABLE_MODULES

Eric Fiselier via cfe-commits cfe-commits at lists.llvm.org
Tue Oct 25 13:07:50 PDT 2016


Author: ericwf
Date: Tue Oct 25 15:07:49 2016
New Revision: 285107

URL: http://llvm.org/viewvc/llvm-project?rev=285107&view=rev
Log:
Get libc++abi building with LLVM_ENABLE_MODULES

Modified:
    libcxxabi/trunk/src/CMakeLists.txt

Modified: libcxxabi/trunk/src/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/CMakeLists.txt?rev=285107&r1=285106&r2=285107&view=diff
==============================================================================
--- libcxxabi/trunk/src/CMakeLists.txt (original)
+++ libcxxabi/trunk/src/CMakeLists.txt Tue Oct 25 15:07:49 2016
@@ -95,6 +95,12 @@ string(REPLACE ";" " " LIBCXXABI_COMPILE
 string(REPLACE ";" " " LIBCXXABI_LINK_FLAGS "${LIBCXXABI_LINK_FLAGS}")
 string(REPLACE ";" " " LIBCXXABI_SHARED_LINK_FLAGS "${LIBCXXABI_SHARED_LINK_FLAGS}")
 
+# FIXME: libc++abi.so will not link when modules are enabled because it depends
+# on symbols defined in libc++.so which has not yet been built.
+if (LLVM_ENABLE_MODULES)
+  string(REPLACE "-Wl,-z,defs" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+endif()
+
 # Add a object library that contains the compiled source files.
 add_library(cxxabi_objects OBJECT ${LIBCXXABI_SOURCES} ${LIBCXXABI_HEADERS})
 




More information about the cfe-commits mailing list