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 | 144019ac22953313f6105446a9431060ace2aec3 (patch) | |
| tree | 640c53da79077ce2b40f90added0c74df1420c86 /libcxxabi | |
| parent | ef40cde1da67121e5262b905cbb9a5564c379bdd (diff) | |
| download | llvm-144019ac22953313f6105446a9431060ace2aec3.zip llvm-144019ac22953313f6105446a9431060ace2aec3.tar.gz llvm-144019ac22953313f6105446a9431060ace2aec3.tar.bz2 | |
Rename c++abi.a on Windows to libc++abi to avoid name conflicts
llvm-svn: 302759
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/src/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt index a347703..1efc92e2 100644 --- a/libcxxabi/src/CMakeLists.txt +++ b/libcxxabi/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() |