Upgraded gcc-4.9.0 -> gcc-4.9.2

This commit is contained in:
Henry
2014-12-16 08:37:57 +00:00
parent 296a302867
commit c347c80f20
4 changed files with 6 additions and 9 deletions

View File

@ -62,7 +62,7 @@ foamInstall=$HOME/$WM_PROJECT
foamCompiler=system foamCompiler=system
#- Compiler: #- Compiler:
# WM_COMPILER = Gcc | Gcc45 | Gcc46 | Gcc47 | Clang | Icc (Intel icc) # WM_COMPILER = Gcc | Gcc45 | Gcc46 | Gcc47 | Gcc48 | Gcc49| Clang | Icc
export WM_COMPILER=Gcc export WM_COMPILER=Gcc
unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH

View File

@ -216,17 +216,14 @@ case OpenFOAM:
case ThirdParty: case ThirdParty:
switch ("$WM_COMPILER") switch ("$WM_COMPILER")
case Gcc: case Gcc:
case Gcc++0x:
case Gcc48: case Gcc48:
case Gcc48++0x:
set gcc_version=gcc-4.8.2 set gcc_version=gcc-4.8.2
set gmp_version=gmp-5.1.2 set gmp_version=gmp-5.1.2
set mpfr_version=mpfr-3.1.2 set mpfr_version=mpfr-3.1.2
set mpc_version=mpc-1.0.1 set mpc_version=mpc-1.0.1
breaksw breaksw
case Gcc49: case Gcc49:
case Gcc49++0x: set gcc_version=gcc-4.9.2
set gcc_version=gcc-4.9.0
set gmp_version=gmp-5.1.2 set gmp_version=gmp-5.1.2
set mpfr_version=mpfr-3.1.2 set mpfr_version=mpfr-3.1.2
set mpc_version=mpc-1.0.1 set mpc_version=mpc-1.0.1

View File

@ -240,14 +240,14 @@ fi
case "${foamCompiler}" in case "${foamCompiler}" in
OpenFOAM | ThirdParty) OpenFOAM | ThirdParty)
case "$WM_COMPILER" in case "$WM_COMPILER" in
Gcc | Gcc++0x | Gcc48 | Gcc48++0x) Gcc | Gcc48)
gcc_version=gcc-4.8.2 gcc_version=gcc-4.8.2
gmp_version=gmp-5.1.2 gmp_version=gmp-5.1.2
mpfr_version=mpfr-3.1.2 mpfr_version=mpfr-3.1.2
mpc_version=mpc-1.0.1 mpc_version=mpc-1.0.1
;; ;;
Gcc49 | Gcc49++0x) Gcc49)
gcc_version=gcc-4.9.0 gcc_version=gcc-4.9.2
gmp_version=gmp-5.1.2 gmp_version=gmp-5.1.2
mpfr_version=mpfr-3.1.2 mpfr_version=mpfr-3.1.2
mpc_version=mpc-1.0.1 mpc_version=mpc-1.0.1

View File

@ -61,7 +61,7 @@ if ( ! $?FOAM_INST_DIR ) setenv FOAM_INST_DIR $foamInstall
setenv foamCompiler system setenv foamCompiler system
#- Compiler: #- Compiler:
# WM_COMPILER = Gcc | Gcc45 | Gcc46 | Gcc47 | Clang | Icc (Intel icc) # WM_COMPILER = Gcc | Gcc45 | Gcc46 | Gcc47 | Gcc48 | Gcc49 | Clang | Icc
setenv WM_COMPILER Gcc setenv WM_COMPILER Gcc
setenv WM_COMPILER_ARCH # defined but empty setenv WM_COMPILER_ARCH # defined but empty
unsetenv WM_COMPILER_LIB_ARCH unsetenv WM_COMPILER_LIB_ARCH