Corrected the setting of WM_COMPILER and renamed I32 and I64 to Icc.

This commit is contained in:
henry
2008-05-29 16:02:39 +01:00
committed by Mark Olesen
parent 92b93a2a68
commit c0a6360f0b
51 changed files with 7 additions and 32 deletions

View File

@ -63,9 +63,10 @@ export WM_PROJECT_USER_DIR=$HOME/$WM_PROJECT/$USER-$WM_PROJECT_VERSION
: ${WM_OS:=Unix}; export WM_OS : ${WM_OS:=Unix}; export WM_OS
# Compiler (if set to "" use the system compiler) # Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
export WM_COMPILER=Gcc43 export WM_COMPILER=Gcc43
export WM_COMPILER_ARCH= export WM_COMPILER_ARCH=
export WM_COMPILER_LIB_ARCH= export WM_COMPILER_LIB_ARCH=
@ -105,13 +106,11 @@ Linux)
# compiler specifics # compiler specifics
case `uname -m` in case `uname -m` in
i686) i686)
# export WM_COMPILER=I32
;; ;;
x86_64) x86_64)
case $WM_ARCH_OPTION in case $WM_ARCH_OPTION in
32) 32)
# export WM_COMPILER=I64
export WM_COMPILER_ARCH='-64' export WM_COMPILER_ARCH='-64'
export WM_CC='gcc' export WM_CC='gcc'
export WM_CXX='g++' export WM_CXX='g++'
@ -122,7 +121,6 @@ Linux)
64) 64)
WM_ARCH=linux64 WM_ARCH=linux64
export WM_COMPILER_LIB_ARCH=64 export WM_COMPILER_LIB_ARCH=64
# export WM_COMPILER=I64
export WM_CC='gcc' export WM_CC='gcc'
export WM_CXX='g++' export WM_CXX='g++'
export WM_CFLAGS='-m64 -fPIC' export WM_CFLAGS='-m64 -fPIC'
@ -144,17 +142,6 @@ Linux)
esac esac
;; ;;
SunOS)
WM_ARCH=solaris
;;
IRIX*)
WM_ARCH=sgiN32
# export WM_ARCH=sgi64
# export WM_COMPILER_LIB_ARCH=/mabi=64
export WM_MPLIB=MPI
;;
*) # an unsupported operating system *) # an unsupported operating system
cat <<USAGE cat <<USAGE

View File

@ -55,9 +55,10 @@ setenv WM_PROJECT_DIR $FOAM_INST_DIR/$WM_PROJECT-$WM_PROJECT_VERSION
setenv WM_PROJECT_USER_DIR $HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION setenv WM_PROJECT_USER_DIR $HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION
# Compiler (if set to "" use the system compiler) # Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
setenv WM_COMPILER Gcc setenv WM_COMPILER Gcc43
setenv WM_COMPILER_ARCH setenv WM_COMPILER_ARCH
setenv WM_COMPILER_LIB_ARCH setenv WM_COMPILER_LIB_ARCH
@ -102,13 +103,11 @@ case Linux:
switch (`uname -m`) switch (`uname -m`)
case i686: case i686:
#setenv WM_COMPILER I32
breaksw breaksw
case x86_64: case x86_64:
switch ($WM_ARCH_OPTION) switch ($WM_ARCH_OPTION)
case 32: case 32:
setenv WM_ARCH linux setenv WM_ARCH linux
#setenv WM_COMPILER I32
setenv WM_COMPILER_ARCH '-64' setenv WM_COMPILER_ARCH '-64'
setenv WM_CC 'gcc' setenv WM_CC 'gcc'
setenv WM_CXX 'g++' setenv WM_CXX 'g++'
@ -140,17 +139,6 @@ case Linux:
endsw endsw
breaksw breaksw
case SunOS:
setenv WM_ARCH solaris
breaksw
case IRIX*:
setenv WM_ARCH sgiN32
# setenv WM_ARCH sgi64
# setenv WM_COMPILER_LIB_ARCH /mabi=64
setenv WM_MPLIB MPI
breaksw
default: default:
echo echo
echo "Your '$WM_ARCH' operating system is not supported by this release" echo "Your '$WM_ARCH' operating system is not supported by this release"