Skip to content
This repository has been archived by the owner on Feb 5, 2019. It is now read-only.

Commit

Permalink
Disable checks for libatomic for now
Browse files Browse the repository at this point in the history
For whatever reason this is failing the i686-freebsd builder in the Rust repo
as-of this red-hot moment. The build seems to work fine without it so let's just
remove it for now and pray there's a better fix later.

Although if you're reading this and know of a better fix, we'd love to remove
this!
  • Loading branch information
alexcrichton committed Jan 26, 2018
1 parent a65bbfd commit 77ab1f0
Showing 1 changed file with 14 additions and 13 deletions.
27 changes: 14 additions & 13 deletions cmake/modules/CheckAtomic.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,20 @@ else()
check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITHOUT_LIB)
endif()

# If not, check if the library exists, and atomics work with it.
if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64)
if(HAVE_CXX_LIBATOMICS64)
list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB)
if (NOT HAVE_CXX_ATOMICS64_WITH_LIB)
message(FATAL_ERROR "Host compiler must support std::atomic!")
endif()
else()
message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.")
endif()
endif()
# RUST-SPECIFIC - commented out, see commit message
# # If not, check if the library exists, and atomics work with it.
# if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
# check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64)
# if(HAVE_CXX_LIBATOMICS64)
# list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
# check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB)
# if (NOT HAVE_CXX_ATOMICS64_WITH_LIB)
# message(FATAL_ERROR "Host compiler must support std::atomic!")
# endif()
# else()
# message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.")
# endif()
# endif()

## TODO: This define is only used for the legacy atomic operations in
## llvm's Atomic.h, which should be replaced. Other code simply
Expand Down

0 comments on commit 77ab1f0

Please sign in to comment.