From 5ffd2e4fe11962e629edb6d9fa3bce17dbc84734 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 31 Jan 2019 12:19:22 +0100
Subject: [PATCH] CONFIG: add config hooks for gcc 6.5.0, gcc 7.4.0
---
etc/bashrc | 2 +-
etc/config.csh/compiler | 6 ++++++
etc/config.sh/compiler | 6 ++++++
etc/cshrc | 2 +-
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/etc/bashrc b/etc/bashrc
index 6f77c9f6fd4..72a52b11180 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -68,7 +68,7 @@ projectDir="$HOME/OpenFOAM/OpenFOAM-$WM_PROJECT_VERSION"
export WM_COMPILER_TYPE=system
# [WM_COMPILER] - Compiler:
-# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-3] | Gcc8[12] |
+# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-5] | Gcc7[1-4] | Gcc8[12] |
# Clang | Clang3[7-9] | Clang[4-6]0 | Icc | Cray | Arm
export WM_COMPILER=Gcc
diff --git a/etc/config.csh/compiler b/etc/config.csh/compiler
index 5f44522f055..d5c8ad27722 100644
--- a/etc/config.csh/compiler
+++ b/etc/config.csh/compiler
@@ -62,6 +62,9 @@ case ThirdParty:
case Gcc64*:
set gcc_version=gcc-6.4.0
breaksw
+ case Gcc65*:
+ set gcc_version=gcc-6.5.0
+ breaksw
case Gcc71*:
set gcc_version=gcc-7.1.0
breaksw
@@ -71,6 +74,9 @@ case ThirdParty:
case Gcc73*:
set gcc_version=gcc-7.3.0
breaksw
+ case Gcc74*:
+ set gcc_version=gcc-7.4.0
+ breaksw
case Gcc81*:
set gcc_version=gcc-8.1.0
breaksw
diff --git a/etc/config.sh/compiler b/etc/config.sh/compiler
index 936f42742da..f75b89c06e6 100644
--- a/etc/config.sh/compiler
+++ b/etc/config.sh/compiler
@@ -60,6 +60,9 @@ ThirdParty)
Gcc64*)
gcc_version=gcc-6.4.0
;;
+ Gcc65*)
+ gcc_version=gcc-6.5.0
+ ;;
Gcc71*)
gcc_version=gcc-7.1.0
;;
@@ -69,6 +72,9 @@ ThirdParty)
Gcc73*)
gcc_version=gcc-7.3.0
;;
+ Gcc74*)
+ gcc_version=gcc-7.4.0
+ ;;
Gcc81*)
gcc_version=gcc-8.1.0
;;
diff --git a/etc/cshrc b/etc/cshrc
index 9f039e6a190..97e25069ca0 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -70,7 +70,7 @@ set projectDir=`lsof +p $$ |& \
setenv WM_COMPILER_TYPE system
# [WM_COMPILER] - Compiler:
-# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-3] | Gcc8[12] |
+# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-5] | Gcc7[1-4] | Gcc8[12] |
# Clang | Clang3[7-9] | Clang[4-6]0 | Icc | Cray | Arm
setenv WM_COMPILER Gcc
--
GitLab