diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-05-11 05:05:06 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-05-11 05:05:06 +0000 |
| commit | 6c3eb5fe0eab4585ebf84d61de98da1d6b6cf754 (patch) | |
| tree | 71ae89ddc2004c9c51f9aefb34b97f00bae7fe8c /libcxxabi | |
| parent | 70c2b1c5517ca7eb41d016434db329065e5d6196 (diff) | |
| download | llvm-6c3eb5fe0eab4585ebf84d61de98da1d6b6cf754.zip llvm-6c3eb5fe0eab4585ebf84d61de98da1d6b6cf754.tar.gz llvm-6c3eb5fe0eab4585ebf84d61de98da1d6b6cf754.tar.bz2 | |
Revert "Rename c++abi.a on Windows to libc++abi to avoid name conflicts"
This reverts commit r302759
llvm-svn: 302762
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/src/CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt index cbf962f..d844b7f 100644 --- a/libcxxabi/src/CMakeLists.txt +++ b/libcxxabi/src/CMakeLists.txt @@ -139,14 +139,10 @@ endif() if (LIBCXXABI_ENABLE_STATIC) add_library(cxxabi_static STATIC $<TARGET_OBJECTS:cxxabi_objects>) target_link_libraries(cxxabi_static ${libraries}) - set(STATIC_OUTPUT_NAME "c++abi") - if (WIN32) - set(STATIC_OUTPUT_NAME "libc++abi") - endif() set_target_properties(cxxabi_static PROPERTIES LINK_FLAGS "${LIBCXXABI_LINK_FLAGS}" - OUTPUT_NAME "${STATIC_OUTPUT_NAME}" + OUTPUT_NAME "c++abi" ) list(APPEND LIBCXXABI_TARGETS "cxxabi_static") endif() |