Cleaning up merge problems

This commit is contained in:
Hrvoje Jasak 2011-11-08 12:30:01 +00:00
parent 72ab66aa0b
commit db96bb9a21

View file

@ -108,8 +108,8 @@ if ( ! $?WM_OSTYPE ) setenv WM_OSTYPE POSIX
# Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
if ( ! $?WM_COMPILER ) setenv WM_COMPILER Gcc
setenv WM_COMPILER Gcc
#setenv WM_COMPILER Icc
#setenv WM_COMPILER Gcc
setenv WM_COMPILER Icc
setenv WM_COMPILER_ARCH
setenv WM_COMPILER_LIB_ARCH