[libcxxabi] r302759 - Rename c++abi.a on Windows to libc++abi to avoid name conflicts

[Eric Fiselier via cfe-commits]

Author: ericwf
Date: Wed May 10 22:18:29 2017
New Revision: 302759

URL: http://llvm.org/viewvc/llvm-project?rev=302759&view=rev
Log:
Rename c++abi.a on Windows to libc++abi to avoid name conflicts

Modified:
    libcxxabi/trunk/src/CMakeLists.txt

Modified: libcxxabi/trunk/src/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/CMakeLists.txt?rev=302759&r1=302758&r2=302759&view=diff
==============================================================================
--- libcxxabi/trunk/src/CMakeLists.txt (original)
+++ libcxxabi/trunk/src/CMakeLists.txt Wed May 10 22:18:29 2017
@@ -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()