[libcxx] r233368 - Only enable special apple link flags for libc++abi (or none)

Eric Fiselier eric at efcs.ca
Fri Mar 27 02:00:45 PDT 2015


Author: ericwf
Date: Fri Mar 27 04:00:45 2015
New Revision: 233368

URL: http://llvm.org/viewvc/llvm-project?rev=233368&view=rev
Log:
Only enable special apple link flags for libc++abi (or none)

Modified:
    libcxx/trunk/lib/CMakeLists.txt

Modified: libcxx/trunk/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/CMakeLists.txt?rev=233368&r1=233367&r2=233368&view=diff
==============================================================================
--- libcxx/trunk/lib/CMakeLists.txt (original)
+++ libcxx/trunk/lib/CMakeLists.txt Fri Mar 27 04:00:45 2015
@@ -67,7 +67,8 @@ target_link_libraries(cxx ${libraries})
 append_if(LIBCXX_COMPILE_FLAGS LIBCXX_HAS_FPIC_FLAG -fPIC)
 append_if(LIBCXX_LINK_FLAGS LIBCXX_HAS_NODEFAULTLIBS_FLAG -nodefaultlibs)
 
-if ( APPLE )
+if ( APPLE AND (LIBCXX_CXX_ABI_LIBNAME STREQUAL "libcxxabi" OR
+                LIBCXX_CXX_ABI_LIBNAME STREQUAL "none"))
   if (NOT DEFINED LIBCXX_LIBCPPABI_VERSION)
     set(LIBCXX_LIBCPPABI_VERSION "2")
   endif()





More information about the cfe-commits mailing list