diff options
author | Eric Fiselier <eric@efcs.ca> | 2017-05-11 03:18:29 +0000 |
---|---|---|
committer | Eric Fiselier <eric@efcs.ca> | 2017-05-11 03:18:29 +0000 |
commit | 9a8ac6a3a5f494e8a1de3191d9fb8cdb32227f8c (patch) | |
tree | 87a2cd1ec347be76da837596367af4a5f7c34d18 /src | |
parent | 8d06271f6a4fdf4b438c11e35b438a963ce80bbf (diff) |
Rename c++abi.a on Windows to libc++abi to avoid name conflicts
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@302759 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a347703..1efc92e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -135,10 +135,14 @@ 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 "c++abi" + OUTPUT_NAME "${STATIC_OUTPUT_NAME}" ) list(APPEND LIBCXXABI_TARGETS "cxxabi_static") endif() |