From af7f1a8cc31d9213d5dae92c97b005a2d6d9bd19 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Wed, 24 Aug 2016 00:24:05 +0000 Subject: [PATCH] Revert "libc++: Perform configuration checks with -nodefaultlibs" This reverts SVN r279584 which broke the buildbots. Will re-apply once the issue has been root-caused and fixed. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@279596 91177308-0d34-0410-b5e6-96231b3b80d8 --- cmake/config-ix.cmake | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index b4c9ac482..3e6c3599d 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -1,26 +1,5 @@ include(CheckLibraryExists) include(CheckCXXCompilerFlag) - -check_library_exists(c fopen "" LIBCXX_HAS_C_LIB) -check_library_exists(gcc_s __gcc_personality_v0 "" LIBCXX_HAS_GCC_S_LIB) - -# libc++ is built with -nodefaultlibs, so we want all our checks to also -# use this option, otherwise we may end up with an inconsistency between -# the flags we think we require during configuration (if the checks are -# performed without -nodefaultlibs) and the flags that are actually -# required during compilation (which has the -nodefaultlibs). libc is -# required for the link to go through. -check_cxx_compiler_flag(-nodefaultlibs LIBCXX_SUPPORTS_NODEFAULTLIBS_FLAG) -if (LIBCXX_SUPPORTS_NODEFAULTLIBS_FLAG) - list(APPEND CMAKE_REQUIRED_LIBRARIES -nodefaultlibs) - if (LIBCXX_HAS_C_LIB) - list(APPEND CMAKE_REQUIRED_LIBRARIES c) - endif () - if (LIBCXX_HAS_GCC_S_LIB) - list(APPEND CMAKE_REQUIRED_LIBRARIES gcc_s) - endif () -endif () - include(CheckLibcxxAtomic) # Check compiler flags @@ -35,5 +14,7 @@ check_cxx_compiler_flag(/GR- LIBCXX_HAS_NO_GR_FLAG) # Check libraries check_library_exists(pthread pthread_create "" LIBCXX_HAS_PTHREAD_LIB) +check_library_exists(c fopen "" LIBCXX_HAS_C_LIB) check_library_exists(m ccos "" LIBCXX_HAS_M_LIB) check_library_exists(rt clock_gettime "" LIBCXX_HAS_RT_LIB) +check_library_exists(gcc_s __gcc_personality_v0 "" LIBCXX_HAS_GCC_S_LIB)