maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "Rename c++abi.a on Windows to libc++abi to avoid name conflicts" 

This reverts commit r302759

llvm-svn: 302762
This commit is contained in:
Eric Fiselier 2017-05-11 05:05:06 +00:00
parent 70c2b1c551
commit 6c3eb5fe0e
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcxxabi/src/CMakeLists.txt
View File

@ -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()