diff --git a/install b/install index 2e2a63db96134657aaeafe2e7704de710eca25fd..718cd23016636ec8b73a481d10b4f9faf9fb8dc4 100755 --- a/install +++ b/install @@ -259,7 +259,11 @@ else echo "Error the installation of Boost failed" exit 1 fi - ./script/install_BOOST.sh $i_dir $ncore + if [ x"$dgc_compiler" == x"icpc" ]; then + ./script/install_BOOST.sh $i_dir $ncore intel-linux + else + ./script/install_BOOST.sh $i_dir $ncore gcc + fi BOOST_installed=1 configure_options=" $configure_options --with-boost=$i_dir/BOOST " elif [ $conf_err -eq 208 ]; then diff --git a/script/detect_gcc b/script/detect_gcc index 7ed16ad3a9d4135f8bf9d050a5645b51fe87e279..a22f097f2811e913ea4909b8056209bdbcd93517 100755 --- a/script/detect_gcc +++ b/script/detect_gcc @@ -163,6 +163,7 @@ function detect_compiler() possible_solutions "${commands[@]}" dgc_compiler=possible_solutions_ret dgc_ret=1 + CXX=$dgc_compiler fi } diff --git a/script/install_BOOST.sh b/script/install_BOOST.sh index c882dc7668b5419d5b81187223c423decf7772ac..87c744be7251d0138ee20ad7839d31c28f08586a 100755 --- a/script/install_BOOST.sh +++ b/script/install_BOOST.sh @@ -10,7 +10,7 @@ fi wget http://ppmcore.mpi-cbg.de/upload/boost_1_60_0.tar.bz2 tar -xvf boost_1_60_0.tar.bz2 cd boost_1_60_0 -./bootstrap.sh +./bootstrap.sh --with-toolset=$3 mkdir $1/BOOST ./b2 -j $2 install --prefix=$1/BOOST rm -rf boost_1_60_0 diff --git a/script/install_OPENBLAS.sh b/script/install_OPENBLAS.sh index 04b863c916991c7f54b6bae8689a1ed3025d1e07..8f01385ee3d31984ef72630a43746bc9020c3b17 100755 --- a/script/install_OPENBLAS.sh +++ b/script/install_OPENBLAS.sh @@ -14,7 +14,7 @@ cd OpenBLAS-0.2.15 # configuration -make +make CC=gcc CXX=g++ mkdir $1/OPENBLAS make install PREFIX=$1/OPENBLAS rm -rf OpenBLAS-0.2.15