diff options
| author | Teresa Johnson <tejohnson@google.com> | 2016-10-28 15:30:27 +0000 |
|---|---|---|
| committer | Teresa Johnson <tejohnson@google.com> | 2016-10-28 15:30:27 +0000 |
| commit | d01fcc71590c320b4c7d111876c81bd3adc3e230 (patch) | |
| tree | 4eeb7176490e019511bdada0adbe7af90fb6bf69 | |
| parent | edd99eb07a9c254b15ff120ef6bcba66a00d2fda (diff) | |
| download | bcm5719-llvm-d01fcc71590c320b4c7d111876c81bd3adc3e230.tar.gz bcm5719-llvm-d01fcc71590c320b4c7d111876c81bd3adc3e230.zip | |
[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
llvm-svn: 285406
| -rw-r--r-- | llvm/cmake/modules/CheckCompilerVersion.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/llvm/cmake/modules/CheckCompilerVersion.cmake b/llvm/cmake/modules/CheckCompilerVersion.cmake index 1c046ade7e1..d3e46624b94 100644 --- a/llvm/cmake/modules/CheckCompilerVersion.cmake +++ b/llvm/cmake/modules/CheckCompilerVersion.cmake @@ -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}) |
