[libcxx] r291306 - Configure default ABI library as NONE on Windows
Eric Fiselier via cfe-commits
cfe-commits at lists.llvm.org
Fri Jan 6 15:59:53 PST 2017
Author: ericwf
Date: Fri Jan 6 17:59:52 2017
New Revision: 291306
URL: http://llvm.org/viewvc/llvm-project?rev=291306&view=rev
Log:
Configure default ABI library as NONE on Windows
Modified:
libcxx/trunk/CMakeLists.txt
Modified: libcxx/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=291306&r1=291305&r2=291306&view=diff
==============================================================================
--- libcxx/trunk/CMakeLists.txt (original)
+++ libcxx/trunk/CMakeLists.txt Fri Jan 6 17:59:52 2017
@@ -116,7 +116,12 @@ if (LIBCXX_CXX_ABI STREQUAL "default")
set(LIBCXX_CXX_ABI_INCLUDE_PATHS "${LIBCXX_LIBCXXABI_INCLUDES_INTERNAL}")
set(LIBCXX_CXX_ABI_INTREE 1)
else()
- set(LIBCXX_CXX_ABI_LIBNAME "default")
+ if (WIN32 AND NOT MINGW)
+ # FIXME: Figure out how to configure the ABI library on Windows.
+ set(LIBCXX_CXX_ABI_LIBNAME "none")
+ else()
+ set(LIBCXX_CXX_ABI_LIBNAME "default")
+ endif()
endif()
else()
set(LIBCXX_CXX_ABI_LIBNAME "${LIBCXX_CXX_ABI}")
More information about the cfe-commits
mailing list