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 | 97146e2a61d690531be6441da3a482e6603832ad (patch) | |
| tree | f1f34ba54ddb05752e4d04168d51d91de3a888f4 /src | |
| parent | 2d383290ccc104dee0fc8db5c478474381dac999 (diff) | |
Revert "Rename c++abi.a on Windows to libc++abi to avoid name conflicts"
This reverts commit r302759
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@302762 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cbf962f..d844b7f 100644 --- a/src/CMakeLists.txt +++ b/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() |