From 91298c77ea5408b1e8bc24bd89bd715bf8cba164 Mon Sep 17 00:00:00 2001 From: Aaron Ballman Date: Mon, 14 Nov 2016 13:33:51 +0000 Subject: [PATCH] Reverting r285406, which was a temporary workaround to get one of the documentation bots upgraded to something newer than GCC 4.7. This restores the check for GCC 4.8. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@286822 91177308-0d34-0410-b5e6-96231b3b80d8 --- cmake/modules/CheckCompilerVersion.cmake | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cmake/modules/CheckCompilerVersion.cmake b/cmake/modules/CheckCompilerVersion.cmake index d3e46624b94..1c046ade7e1 100644 --- a/cmake/modules/CheckCompilerVersion.cmake +++ b/cmake/modules/CheckCompilerVersion.cmake @@ -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) @@ -36,8 +35,7 @@ std::atomic 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}) -- 2.50.1