[PATCH] D26078: [cmake] Temporarily revert enforcement of minimum GCC version increase

[Teresa Johnson via llvm-commits]

tejohnson created this revision.
tejohnson added a reviewer: aaron.ballman.
tejohnson added a subscriber: llvm-commits.
Herald added a subscriber: mgorny.

This is temporary, until bot that builds public facing LLVM
documentation is upgraded. It reverts only the cmake change in r284497,
but leaves the doc changes in place to preserve intent.


https://reviews.llvm.org/D26078

Files:
  cmake/modules/CheckCompilerVersion.cmake


Index: cmake/modules/CheckCompilerVersion.cmake
===================================================================
--- cmake/modules/CheckCompilerVersion.cmake
+++ cmake/modules/CheckCompilerVersion.cmake
@@ -8,8 +8,9 @@
 
   if(NOT LLVM_FORCE_USE_OLD_TOOLCHAIN)
     if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
-        message(FATAL_ERROR "Host GCC version must be at least 4.8!")
+      # 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!")
       endif()
     elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
       if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.1)
@@ -35,7 +36,8 @@
 int main() { return (float)x; }"
           LLVM_NO_OLD_LIBSTDCXX)
         if(NOT LLVM_NO_OLD_LIBSTDCXX)
-          message(FATAL_ERROR "Host Clang must be able to find libstdc++4.8 or newer!")
+          # 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!")
         endif()
         set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
         set(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D26078.76198.patch
Type: text/x-patch
Size: 1298 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20161028/e9a96a57/attachment.bin>