diff --git a/etc/config/settings.csh b/etc/config/settings.csh index 244e52fdcf..dad1d03f7e 100644 --- a/etc/config/settings.csh +++ b/etc/config/settings.csh @@ -217,20 +217,6 @@ case ThirdParty: switch ("$WM_COMPILER") case Gcc: case Gcc++0x: - case Gcc46: - case Gcc46++0x: - set gcc_version=gcc-4.6.1 - set gmp_version=gmp-5.0.4 - set mpfr_version=mpfr-3.1.0 - set mpc_version=mpc-0.9 - breaksw - case Gcc49: - case Gcc49++0x: - set gcc_version=gcc-4.9.0 - set gmp_version=gmp-5.1.2 - set mpfr_version=mpfr-3.1.2 - set mpc_version=mpc-1.0.1 - breaksw case Gcc48: case Gcc48++0x: set gcc_version=gcc-4.8.2 @@ -238,19 +224,12 @@ case ThirdParty: set mpfr_version=mpfr-3.1.2 set mpc_version=mpc-1.0.1 breaksw - case Gcc47: - case Gcc47++0x: - set gcc_version=gcc-4.7.2 - set gmp_version=gmp-5.0.4 - set mpfr_version=mpfr-3.1.0 - set mpc_version=mpc-0.9 - breaksw - case Gcc45: - case Gcc45++0x: - set gcc_version=gcc-4.5.2 - set gmp_version=gmp-5.0.1 - set mpfr_version=mpfr-2.4.2 - set mpc_version=mpc-0.8.1 + case Gcc49: + case Gcc49++0x: + set gcc_version=gcc-4.9.0 + set gmp_version=gmp-5.1.2 + set mpfr_version=mpfr-3.1.2 + set mpc_version=mpc-1.0.1 breaksw case Clang: # using clang - not gcc diff --git a/etc/config/settings.sh b/etc/config/settings.sh index 4fa9120ec1..ec2dcf20e6 100644 --- a/etc/config/settings.sh +++ b/etc/config/settings.sh @@ -240,11 +240,11 @@ fi case "${foamCompiler}" in OpenFOAM | ThirdParty) case "$WM_COMPILER" in - Gcc | Gcc++0x | Gcc46 | Gcc46++0x) - gcc_version=gcc-4.6.1 - gmp_version=gmp-5.0.4 - mpfr_version=mpfr-3.1.0 - mpc_version=mpc-0.9 + Gcc | Gcc++0x | Gcc48 | Gcc48++0x) + gcc_version=gcc-4.8.2 + gmp_version=gmp-5.1.2 + mpfr_version=mpfr-3.1.2 + mpc_version=mpc-1.0.1 ;; Gcc49 | Gcc49++0x) gcc_version=gcc-4.9.0 @@ -252,24 +252,6 @@ OpenFOAM | ThirdParty) mpfr_version=mpfr-3.1.2 mpc_version=mpc-1.0.1 ;; - Gcc48 | Gcc48++0x) - gcc_version=gcc-4.8.2 - gmp_version=gmp-5.1.2 - mpfr_version=mpfr-3.1.2 - mpc_version=mpc-1.0.1 - ;; - Gcc47 | Gcc47++0x) - gcc_version=gcc-4.7.2 - gmp_version=gmp-5.0.4 - mpfr_version=mpfr-3.1.0 - mpc_version=mpc-0.9 - ;; - Gcc45 | Gcc45++0x) - gcc_version=gcc-4.5.2 - gmp_version=gmp-5.0.1 - mpfr_version=mpfr-2.4.2 - mpc_version=mpc-0.8.1 - ;; Clang) # using clang - not gcc export WM_CC='clang'