Commit a6116719 authored by incardon's avatar incardon
Browse files

Fixing gin compilation

parent 1e984b74
......@@ -29,14 +29,13 @@ then
echo 1 > $HOME/$5/MPI/version
fi
module load gcc/4.9.2
### Activate MPI ###
export PATH="$PATH:$HOME/$5/MPI/bin"
mkdir $HOME/$5
if [ x"$4" == x"full" ]; then
./install -i $HOME/$5 -s -c "--prefix=/home/jenkins/openfpm_install"
./install CC=gcc-4.9.2 CXX=g++-4.9.2 FC=gfortran-4.9.2 F77=gfortran-4.9.2 -i $HOME/$5 -s -c "--prefix=/home/jenkins/openfpm_install"
mv $HOME/openfpm_vars $HOME/openfpm_vars_$5
source $HOME/openfpm_vars_$5
elif [ x"$3" == x"numerics" ]; then
......
......@@ -23,6 +23,29 @@ function detect_compiler()
dgc_ret=0
if [ x"$CXX" != x"" -o x"$CC" != x"" -o x"$F77" != x"" -o x"$FC" != x"" ]; then
if [ $CXX ]
echo -e "\033[1;34;5m ---------------------------------------------------------------------- \033[0m"
echo -e "\033[1;34;5m Selected compilers \033[0m"
echo -e "\033[1;34;5m ---------------------------------------------------------------------- \033[0m"
echo -e "\033[91;1m The user request to use specifics compilers to compile C/C++ or Fortran code \033[0m"
echo -e "\033[91;1m specifing one or more of these variables CXX/CC/F77/FC. When at least one is \033[0m"
echo -e "\033[91;1m defined the specified compiler will be used. \033[0m"
echo -e "\033[91;1m When not specified the system will use the default g++/gcc/gfortran/gfortran \033[0m"
echo -e "\033[91;1m The installer will use the following compilers \033[0m"
echo -e ""
echo -e "CXX=$CXX"
echo -e "CC=$CC"
echo -e "F77=$F77"
echo -e "FC=$FC"
return
fi
# First we try to understand if g++ command line is linked to clang
g++ --version | grep "Apple LLVM"
......
......@@ -156,6 +156,7 @@ function remove_old()
echo -e "\033[1;34;5m OPENBLAS has been updated, the component will be updated automatically \033[0m"
echo -e "\033[1;34;5m ---------------------------------------------------------------------- \033[0m"
sleep 5
rm -rf $1/OPENBLAS
rm -rf $1/EIGEN
rm -rf $1/PETSC
rm -rf $1/SUITESPARSE
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment