diff options
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/cmake/config-ix.cmake | 2 | ||||
| -rw-r--r-- | libcxxabi/src/CMakeLists.txt | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/libcxxabi/cmake/config-ix.cmake b/libcxxabi/cmake/config-ix.cmake index f4ee894..702fe7d 100644 --- a/libcxxabi/cmake/config-ix.cmake +++ b/libcxxabi/cmake/config-ix.cmake @@ -95,11 +95,9 @@ if(FUCHSIA) set(LIBCXXABI_HAS_PTHREAD_LIB NO) check_library_exists(c __cxa_thread_atexit_impl "" LIBCXXABI_HAS_CXA_THREAD_ATEXIT_IMPL) - set(LIBCXXABI_HAS_SYSTEM_LIB NO) else() check_library_exists(dl dladdr "" LIBCXXABI_HAS_DL_LIB) check_library_exists(pthread pthread_once "" LIBCXXABI_HAS_PTHREAD_LIB) check_library_exists(c __cxa_thread_atexit_impl "" LIBCXXABI_HAS_CXA_THREAD_ATEXIT_IMPL) - check_library_exists(System write "" LIBCXXABI_HAS_SYSTEM_LIB) endif() diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt index 3decda3..06a9a5f 100644 --- a/libcxxabi/src/CMakeLists.txt +++ b/libcxxabi/src/CMakeLists.txt @@ -67,9 +67,7 @@ if (LIBCXXABI_ENABLE_FORGIVING_DYNAMIC_CAST) add_definitions(-D_LIBCXXABI_FORGIVING_DYNAMIC_CAST) endif() -if (APPLE) - add_library_flags_if(LIBCXXABI_HAS_SYSTEM_LIB System) -else() +if (NOT APPLE) # On Apple platforms, we always use -nostdlib++ so we don't need to re-add other libraries if (LIBCXXABI_ENABLE_THREADS) add_library_flags_if(LIBCXXABI_HAS_PTHREAD_LIB pthread) endif() |