From c9bfcc665ae0d6e911bf7a1b27bf3726571e59db Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 29 May 2016 22:28:07 +0100
Subject: [PATCH] etc/config.*: Added support for gcc-6.1

---
 etc/config.csh/settings | 9 ++++++---
 etc/config.sh/compiler  | 3 +++
 etc/config.sh/settings  | 6 +++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/etc/config.csh/settings b/etc/config.csh/settings
index d5922e0f0..c1fbd0643 100644
--- a/etc/config.csh/settings
+++ b/etc/config.csh/settings
@@ -246,6 +246,9 @@ case ThirdParty:
     case Gcc53:
         set gcc_version=gcc-5.3.0
         breaksw
+    case Gcc61:
+        set gcc_version=gcc-6.1.0
+        breaksw
     case Clang:
         # Using clang - not gcc
         setenv WM_CC 'clang'
@@ -290,12 +293,12 @@ case ThirdParty:
         _foamAddLib     $gccDir/lib$WM_COMPILER_LIB_ARCH
 
         # Add gmp/mpfr libraries to run-time environment
-        _foamAddLib     $gmpDir/lib
-        _foamAddLib     $mpfrDir/lib
+        _foamAddLib     $gmpDir/lib$WM_COMPILER_LIB_ARCH
+        _foamAddLib     $mpfrDir/lib$WM_COMPILER_LIB_ARCH
 
         # Add mpc libraries (not need for older gcc) to run-time environment
         if ( $?mpc_version ) then
-            _foamAddLib     $mpcDir/lib
+            _foamAddLib     $mpcDir/lib$WM_COMPILER_LIB_ARCH
         endif
 
         # Used by boost/CGAL:
diff --git a/etc/config.sh/compiler b/etc/config.sh/compiler
index 63099a792..beba1e542 100644
--- a/etc/config.sh/compiler
+++ b/etc/config.sh/compiler
@@ -63,6 +63,9 @@ OpenFOAM | ThirdParty)
     Gcc53)
         gcc_version=gcc-5.3.0
         ;;
+    Gcc61)
+        gcc_version=gcc-6.1.0
+        ;;
     Clang)
         # Using clang - not gcc
         export WM_CC='clang'
diff --git a/etc/config.sh/settings b/etc/config.sh/settings
index cf520d6a8..438a3253f 100644
--- a/etc/config.sh/settings
+++ b/etc/config.sh/settings
@@ -241,13 +241,13 @@ OpenFOAM | ThirdParty)
         _foamAddLib     $gccDir/lib$WM_COMPILER_LIB_ARCH
 
         # Add gmp/mpfr libraries to run-time environment
-        _foamAddLib     $gmpDir/lib
-        _foamAddLib     $mpfrDir/lib
+        _foamAddLib     $gmpDir/lib$WM_COMPILER_LIB_ARCH
+        _foamAddLib     $mpfrDir/lib$WM_COMPILER_LIB_ARCH
 
         # Add mpc libraries (not need for older gcc) to run-time environment
         if [ -n "$mpc_version" ]
         then
-            _foamAddLib     $mpcDir/lib
+            _foamAddLib     $mpcDir/lib$WM_COMPILER_LIB_ARCH
         fi
 
         # Used by boost/CGAL: