[llvm] r286822 - 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.

Aaron Ballman via llvm-commits llvm-commits at lists.llvm.org
Mon Nov 14 05:33:52 PST 2016


Author: aaronballman
Date: Mon Nov 14 07:33:51 2016
New Revision: 286822

URL: http://llvm.org/viewvc/llvm-project?rev=286822&view=rev
Log:
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.

Modified:
    llvm/trunk/cmake/modules/CheckCompilerVersion.cmake

Modified: llvm/trunk/cmake/modules/CheckCompilerVersion.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/CheckCompilerVersion.cmake?rev=286822&r1=286821&r2=286822&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/CheckCompilerVersion.cmake (original)
+++ llvm/trunk/cmake/modules/CheckCompilerVersion.cmake Mon Nov 14 07:33:51 2016
@@ -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<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})




More information about the llvm-commits mailing list