From 2c0b1d5c39cb49131ce1da06a35b4a2bbb5834cb Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 16 Jun 2020 12:17:08 +0200
Subject: [PATCH] Bump minimum gcc to 9.
Note: on frontends it still works with 8.3, don't ask why...
---
scripts/cmake/CompilerSetup.cmake | 8 +++++---
web/data/versions.json | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/scripts/cmake/CompilerSetup.cmake b/scripts/cmake/CompilerSetup.cmake
index 0cac5604136..695c3ca8749 100644
--- a/scripts/cmake/CompilerSetup.cmake
+++ b/scripts/cmake/CompilerSetup.cmake
@@ -74,9 +74,11 @@ if(COMPILER_IS_GCC OR COMPILER_IS_CLANG OR COMPILER_IS_INTEL)
endif()
if(COMPILER_IS_GCC)
- if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${ogs.minimum_version.gcc})
- message(FATAL_ERROR "Aborting: GCC ${ogs.minimum_version.gcc} is \
- required! Found version ${CMAKE_CXX_COMPILER_VERSION}.")
+ if(NOT "${HOSTNAME}" MATCHES "frontend.*") # TODO: remove later
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${ogs.minimum_version.gcc})
+ message(FATAL_ERROR "Aborting: GCC ${ogs.minimum_version.gcc} is \
+ required! Found version ${CMAKE_CXX_COMPILER_VERSION}.")
+ endif()
endif()
add_compile_options(-fext-numeric-literals)
include(GCCSanitizer)
diff --git a/web/data/versions.json b/web/data/versions.json
index 79563e9cbe9..d429d072372 100644
--- a/web/data/versions.json
+++ b/web/data/versions.json
@@ -1,6 +1,6 @@
{
"minimum_version": {
- "gcc": "8.0",
+ "gcc": "9.0",
"clang": "9.0",
"msvc": {
"year": "2019",
--
GitLab