From 6c3eb5fe0eab4585ebf84d61de98da1d6b6cf754 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Thu, 11 May 2017 05:05:06 +0000 Subject: [PATCH] Revert "Rename c++abi.a on Windows to libc++abi to avoid name conflicts" This reverts commit r302759 llvm-svn: 302762 --- libcxxabi/src/CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 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_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() -- 2.7.4