Author: ericwf
Date: Thu May 11 00:05:06 2017
New Revision: 302762
URL: http://llvm.org/viewvc/llvm-project?rev=302762&view=rev
Log:
Revert "Rename c++abi.a on Windows to libc++abi to avoid name conflicts"
This reverts commit r302759
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=302762&r1=302761&r2=302762&view=diff
==============================================================================
--- libcxxabi/trunk/src/CMakeLists.txt (original)
+++ libcxxabi/trunk/src/CMakeLists.txt Thu May 11 00:05:06 2017
@@ -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()
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
