From a7a0316a6ffc0f454bf8aa0ba528002cf19851a3 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Sun, 16 Jul 2017 00:23:08 +0200
Subject: [PATCH] fixing gin
---
build.sh | 8 ++++----
script/detect_gcc | 43 ++++++++++++++++++++++++++++++-------------
2 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/build.sh b/build.sh
index 9adccb78..733d46cc 100755
--- a/build.sh
+++ b/build.sh
@@ -25,7 +25,7 @@ then
if [ ! -d $HOME/$5/MPI ]; then
echo "COPY MPICH"
- cp -R $HOME/MPI_base $HOME/$5/MPI
+ cp -R $HOME/MPI $HOME/$5/MPI
echo 1 > $HOME/$5/MPI/version
fi
@@ -35,16 +35,16 @@ then
mkdir $HOME/$5
if [ x"$4" == x"full" ]; then
- ./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"
+ CC=gcc-4.9.2 CXX=g++-4.9.2 FC=gfortran-4.9.2 F77=gfortran-4.9.2 ./install -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
- ./install -i $HOME/$5 -m -s -c "--prefix=/home/jenkins/openfpm_install"
+ CC=gcc-4.9.2 CXX=g++-4.9.2 FC=gfortran-4.9.2 F77=gfortran-4.9.2 ./install -i $HOME/$5 -m -s -c "--prefix=/home/jenkins/openfpm_install"
mv $HOME/openfpm_vars $HOME/openfpm_vars_$5
source $HOME/openfpm_vars_$5
make $3
else
- ./install -i $HOME/$5 -m -s -c "--prefix=/home/jenkins/openfpm_install --no-recursion"
+ CC=gcc-4.9.2 CXX=g++-4.9.2 FC=gfortran-4.9.2 F77=gfortran-4.9.2 ./install -i $HOME/$5 -m -s -c "--prefix=/home/jenkins/openfpm_install --no-recursion"
mv $HOME/openfpm_vars $HOME/openfpm_vars_$5
source $HOME/openfpm_vars_$5
make $3
diff --git a/script/detect_gcc b/script/detect_gcc
index 04bd00d5..aab7f4a5 100755
--- a/script/detect_gcc
+++ b/script/detect_gcc
@@ -23,25 +23,42 @@ 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 ]
+ if [ x"$CXX" != x"" -o x"$CC" != x"" -o x"$F77" != x"" -o x"$FC" != x"" ]; then
+
+ if [ x"$CXX" == x"" ]; then
+ CXX=g++
+ fi
+
+ if [ x"$CC" == x"" ]; then
+ CC=gcc
+ fi
+
+ if [ x"$FC" == x"" ]; then
+ FC=gfortran
+ fi
+
+ if [ x"$F77" == x"" ]; then
+ F77=gfortran
+ fi
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 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"
+ 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"
+
+ dgc_ret=1
+ dgc_compiler=$CXX
return
fi
--
GitLab