diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2016-08-24 00:24:05 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2016-08-24 00:24:05 +0000 |
| commit | 7fe0681e28379ed875367b7fdd4032b761c0bc1c (patch) | |
| tree | 9e567a16c48db859808c5c67f43a0f1b2be76f23 /libcxx/cmake | |
| parent | 865a98d2edb454e77b963ffdd371580aa343b2b6 (diff) | |
| download | bcm5719-llvm-7fe0681e28379ed875367b7fdd4032b761c0bc1c.tar.gz bcm5719-llvm-7fe0681e28379ed875367b7fdd4032b761c0bc1c.zip | |
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.
llvm-svn: 279596
Diffstat (limited to 'libcxx/cmake')
| -rw-r--r-- | libcxx/cmake/config-ix.cmake | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/libcxx/cmake/config-ix.cmake b/libcxx/cmake/config-ix.cmake index b4c9ac482cf..3e6c3599d23 100644 --- a/libcxx/cmake/config-ix.cmake +++ b/libcxx/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) |
