aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-10-25 20:07:49 +0000
committerEric Fiselier <eric@efcs.ca>2016-10-25 20:07:49 +0000
commitf6c4ab901b18b42cf26ad4984466ff9f51c48b42 (patch)
treef221a5d4e783c217a1438258982cf6befa9b0bf1
parent7696dc06858de87dd38192c558d190037df6f999 (diff)
downloadllvm-f6c4ab901b18b42cf26ad4984466ff9f51c48b42.zip
llvm-f6c4ab901b18b42cf26ad4984466ff9f51c48b42.tar.gz
llvm-f6c4ab901b18b42cf26ad4984466ff9f51c48b42.tar.bz2
Get libc++abi building with LLVM_ENABLE_MODULES
llvm-svn: 285107
-rw-r--r--libcxxabi/src/CMakeLists.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt
index a45c11b..e6bd381 100644
--- a/libcxxabi/src/CMakeLists.txt
+++ b/libcxxabi/src/CMakeLists.txt
@@ -95,6 +95,12 @@ string(REPLACE ";" " " LIBCXXABI_COMPILE_FLAGS "${LIBCXXABI_COMPILE_FLAGS}")
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})