[llvm] r285406 - [cmake] Temporarily revert enforcement of minimum GCC version increase

Teresa Johnson via llvm-commits llvm-commits at lists.llvm.org
Fri Oct 28 08:30:27 PDT 2016


Author: tejohnson
Date: Fri Oct 28 10:30:27 2016
New Revision: 285406

URL: http://llvm.org/viewvc/llvm-project?rev=285406&view=rev
Log:
[cmake] Temporarily revert enforcement of minimum GCC version increase

Summary:
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.

Reviewers: aaron.ballman

Subscribers: mgorny, llvm-commits

Differential Revision: https://reviews.llvm.org/D26078

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=285406&r1=285405&r2=285406&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/CheckCompilerVersion.cmake (original)
+++ llvm/trunk/cmake/modules/CheckCompilerVersion.cmake Fri Oct 28 10:30:27 2016
@@ -8,8 +8,9 @@ if(NOT DEFINED LLVM_COMPILER_CHECKED)
 
   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 @@ std::atomic<float> x(0.0f);
 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})




More information about the llvm-commits mailing list