From 144019ac22953313f6105446a9431060ace2aec3 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Thu, 11 May 2017 03:18:29 +0000 Subject: [PATCH] Rename c++abi.a on Windows to libc++abi to avoid name conflicts llvm-svn: 302759 --- libcxxabi/src/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt index a347703..1efc92e2 100644 --- a/libcxxabi/src/CMakeLists.txt +++ b/libcxxabi/src/CMakeLists.txt @@ -135,10 +135,14 @@ 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 "c++abi" + OUTPUT_NAME "${STATIC_OUTPUT_NAME}" ) list(APPEND LIBCXXABI_TARGETS "cxxabi_static") endif() -- 2.7.4