diff --git a/etc/config.csh/settings b/etc/config.csh/settings
index e54ff41380..1f9ae3a8a6 100644
--- a/etc/config.csh/settings
+++ b/etc/config.csh/settings
@@ -275,9 +275,7 @@ case ThirdParty:
         set gccDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gcc_version
         set gmpDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gmp_version
         set mpfrDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mpfr_version
-        if ( $?mpc_version ) then
-            set mpcDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mpc_version
-        endif
+        set mpcDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mpc_version
 
         # Check that the compiler directory can be found
         if ( ! -d "$gccDir" ) then
@@ -296,14 +294,10 @@ case ThirdParty:
         # Add compiler libraries to run-time environment
         _foamAddLib     $gccDir/lib$WM_COMPILER_LIB_ARCH
 
-        # Add gmp/mpfr libraries to run-time environment
-        _foamAddLib     $gmpDir/lib
-        _foamAddLib     $mpfrDir/lib
-
-        # Add mpc libraries (not need for older gcc) to run-time environment
-        if ( $?mpc_version ) then
-            _foamAddLib     $mpcDir/lib
-        endif
+        # Add gmp/mpfr/mpc libraries to run-time environment
+        _foamAddLib     $gmpDir/lib$WM_COMPILER_LIB_ARCH
+        _foamAddLib     $mpfrDir/lib$WM_COMPILER_LIB_ARCH
+        _foamAddLib     $mpcDir/lib$WM_COMPILER_LIB_ARCH
 
         # Used by boost/CGAL:
         setenv MPFR_ARCH_PATH $mpfrDir
diff --git a/etc/config.sh/settings b/etc/config.sh/settings
index f53af4b162..c77b084275 100644
--- a/etc/config.sh/settings
+++ b/etc/config.sh/settings
@@ -240,15 +240,10 @@ OpenFOAM | ThirdParty)
         # Add compiler libraries to run-time environment
         _foamAddLib     $gccDir/lib$WM_COMPILER_LIB_ARCH
 
-        # Add gmp/mpfr libraries to run-time environment
-        _foamAddLib     $gmpDir/lib
-        _foamAddLib     $mpfrDir/lib
-
-        # Add mpc libraries (not need for older gcc) to run-time environment
-        if [ -n "$mpc_version" ]
-        then
-            _foamAddLib     $mpcDir/lib
-        fi
+        # Add gmp/mpfr/mpc libraries to run-time environment
+        _foamAddLib $gmpDir/lib$WM_COMPILER_LIB_ARCH
+        _foamAddLib $mpfrDir/lib$WM_COMPILER_LIB_ARCH
+        _foamAddLib $mpcDir/lib$WM_COMPILER_LIB_ARCH
 
         # Used by boost/CGAL:
         export MPFR_ARCH_PATH=$mpfrDir