From: Eric Fiselier <eric@efcs.ca>
Date: Thu, 11 May 2017 05:05:06 +0000 (+0000)
Subject: Revert "Rename c++abi.a on Windows to libc++abi to avoid name conflicts"
X-Git-Tag: llvmorg-5.0.0-rc1~5368
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c3eb5fe0eab4585ebf84d61de98da1d6b6cf754;p=platform%2Fupstream%2Fllvm.git

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

This reverts commit r302759

llvm-svn: 302762
---

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