Skip to content

Commit

Permalink
Reverting r285406, which was a temporary workaround to get one of the…
Browse files Browse the repository at this point in the history
… documentation bots upgraded to something newer than GCC 4.7. This restores the check for GCC 4.8.

llvm-svn: 286822
  • Loading branch information
AaronBallman committed Nov 14, 2016
1 parent 5136dd8 commit c78f5d4
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions llvm/cmake/modules/CheckCompilerVersion.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ if(NOT DEFINED LLVM_COMPILER_CHECKED)

if(NOT LLVM_FORCE_USE_OLD_TOOLCHAIN)
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
# FIXME: Change this to 4.8 once documentation builder bot is upgraded
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
message(FATAL_ERROR "Host GCC version must be at least 4.7!")
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
message(FATAL_ERROR "Host GCC version must be at least 4.8!")
endif()
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.1)
Expand All @@ -36,8 +35,7 @@ std::atomic<float> x(0.0f);
int main() { return (float)x; }"
LLVM_NO_OLD_LIBSTDCXX)
if(NOT LLVM_NO_OLD_LIBSTDCXX)
# FIXME: Change this to 4.8 once documentation builder bot is upgraded
message(FATAL_ERROR "Host Clang must be able to find libstdc++4.7 or newer!")
message(FATAL_ERROR "Host Clang must be able to find libstdc++4.8 or newer!")
endif()
set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
set(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
Expand Down

0 comments on commit c78f5d4

Please sign in to comment.