mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Changed gcc version to 4.3.2 and improved the "settings" scripts.
This commit is contained in:
@ -82,7 +82,10 @@ switch ("$WM_COMPILER_INST")
|
|||||||
case OpenFOAM:
|
case OpenFOAM:
|
||||||
switch ("$WM_COMPILER")
|
switch ("$WM_COMPILER")
|
||||||
case Gcc:
|
case Gcc:
|
||||||
setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.1/platforms/$WM_ARCH$WM_COMPILER_ARCH
|
#setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.1/platforms/$WM_ARCH$WM_COMPILER_ARCH
|
||||||
|
setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
|
||||||
|
_foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.3.2/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
|
||||||
|
_foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.3/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
|
||||||
breaksw
|
breaksw
|
||||||
case Gcc42:
|
case Gcc42:
|
||||||
setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH
|
setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH
|
||||||
@ -105,13 +108,8 @@ case OpenFOAM:
|
|||||||
endsw
|
endsw
|
||||||
|
|
||||||
if ($?WM_COMPILER_BIN) then
|
if ($?WM_COMPILER_BIN) then
|
||||||
set path=($WM_COMPILER_BIN $path)
|
_foamAddPath $WM_COMPILER_BIN
|
||||||
|
_foamAddLib $WM_COMPILER_LIB
|
||||||
if ($?LD_LIBRARY_PATH) then
|
|
||||||
setenv LD_LIBRARY_PATH ${WM_COMPILER_LIB}:${LD_LIBRARY_PATH}
|
|
||||||
else
|
|
||||||
setenv LD_LIBRARY_PATH ${WM_COMPILER_LIB}
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
unset WM_COMPILER_BIN
|
unset WM_COMPILER_BIN
|
||||||
|
|||||||
@ -99,7 +99,10 @@ case "$WM_COMPILER_INST" in
|
|||||||
OpenFOAM)
|
OpenFOAM)
|
||||||
case "$WM_COMPILER" in
|
case "$WM_COMPILER" in
|
||||||
Gcc)
|
Gcc)
|
||||||
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.1/platforms/$WM_ARCH$WM_COMPILER_ARCH
|
#export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.1/platforms/$WM_ARCH$WM_COMPILER_ARCH
|
||||||
|
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
|
||||||
|
_foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.3.2/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
|
||||||
|
_foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.3/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
|
||||||
;;
|
;;
|
||||||
Gcc42)
|
Gcc42)
|
||||||
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH
|
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH
|
||||||
@ -123,8 +126,8 @@ OpenFOAM)
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
if [ -d "$WM_COMPILER_BIN" ]; then
|
if [ -d "$WM_COMPILER_BIN" ]; then
|
||||||
export PATH=$WM_COMPILER_BIN:$PATH
|
_foamAddPath $WM_COMPILER_BIN
|
||||||
export LD_LIBRARY_PATH=$WM_COMPILER_LIB:$LD_LIBRARY_PATH
|
_foamAddLib $WM_COMPILER_LIB
|
||||||
fi
|
fi
|
||||||
|
|
||||||
unset WM_COMPILER_BIN WM_COMPILER_LIB
|
unset WM_COMPILER_BIN WM_COMPILER_LIB
|
||||||
|
|||||||
Reference in New Issue
Block a user