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

Commit 77ab1f0

Browse files
committed
Disable checks for libatomic for now
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!
1 parent a65bbfd commit 77ab1f0

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

Diff for: cmake/modules/CheckAtomic.cmake

+14-13
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,20 @@ else()
6262
check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITHOUT_LIB)
6363
endif()
6464

65-
# If not, check if the library exists, and atomics work with it.
66-
if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
67-
check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64)
68-
if(HAVE_CXX_LIBATOMICS64)
69-
list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
70-
check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB)
71-
if (NOT HAVE_CXX_ATOMICS64_WITH_LIB)
72-
message(FATAL_ERROR "Host compiler must support std::atomic!")
73-
endif()
74-
else()
75-
message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.")
76-
endif()
77-
endif()
65+
# RUST-SPECIFIC - commented out, see commit message
66+
# # If not, check if the library exists, and atomics work with it.
67+
# if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
68+
# check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64)
69+
# if(HAVE_CXX_LIBATOMICS64)
70+
# list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
71+
# check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB)
72+
# if (NOT HAVE_CXX_ATOMICS64_WITH_LIB)
73+
# message(FATAL_ERROR "Host compiler must support std::atomic!")
74+
# endif()
75+
# else()
76+
# message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.")
77+
# endif()
78+
# endif()
7879

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

0 commit comments

Comments
 (0)