diff options
| author | Aaron Ballman <aaron@aaronballman.com> | 2016-11-14 13:33:51 +0000 |
|---|---|---|
| committer | Aaron Ballman <aaron@aaronballman.com> | 2016-11-14 13:33:51 +0000 |
| commit | c78f5d4194e466fd9cf234c03f33822242a69fb4 (patch) | |
| tree | 91cb1eb9bbb6c1cdbc492a70073f81db3a5b699d /llvm/cmake/modules | |
| parent | 5136dd81ad4e661bc6fd9f70a93bf738fec566a8 (diff) | |
| download | bcm5719-llvm-c78f5d4194e466fd9cf234c03f33822242a69fb4.tar.gz bcm5719-llvm-c78f5d4194e466fd9cf234c03f33822242a69fb4.zip | |
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.
llvm-svn: 286822
Diffstat (limited to 'llvm/cmake/modules')
| -rw-r--r-- | llvm/cmake/modules/CheckCompilerVersion.cmake | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/llvm/cmake/modules/CheckCompilerVersion.cmake b/llvm/cmake/modules/CheckCompilerVersion.cmake index d3e46624b94..1c046ade7e1 100644 --- a/llvm/cmake/modules/CheckCompilerVersion.cmake +++ b/llvm/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<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}) |
