Commit 000fc683 authored by incardon's avatar incardon

Fixing installation with GPU using custom compiler

parent 1804d588
......@@ -230,7 +230,7 @@ do
if [ x"$CXX" == x"" ]; then
conf_options="$conf_options"
else
conf_options="$conf_options -DCUDA_HOST_COMPILER=$CXX"
conf_options="$conf_options -DCMAKE_CUDA_HOST_COMPILER=$(which $CXX)"
fi
conf_options="$conf_options -DENABLE_GPU=ON"
;;
......
......@@ -361,7 +361,11 @@ else
elif [ x"$CXX" == x"clang++" ]; then
./script/install_BOOST.sh $i_dir $ncore darwin
else
./script/install_BOOST.sh $i_dir $ncore gcc
if [ x"$CXX" == x"gcc" ]; then
./script/install_BOOST.sh $i_dir $ncore gcc
else
./script/install_BOOST.sh $i_dir $ncore gcc $(which $CXX) $dgc_major $dgc_middle
fi
fi
BOOST_installed=1
configure_options=" $configure_options --with-boost=$i_dir/BOOST "
......
......@@ -10,8 +10,23 @@ fi
wget http://ppmcore.mpi-cbg.de/upload/boost_1_68_0.tar.bz2
tar -xvf boost_1_68_0.tar.bz2
cd boost_1_68_0
if [ x"$4" != x"" ]; then
if [ -f $HOME/user-config.jam ]; then
mv $HOME/user-config.jam $HOME/user-config.jam_bck
fi
if [ x"$5" != x"" ]; then
echo "using gcc : $5.$6 : $4 ; " > $HOME/user-config.jam
else
echo "using gcc : : $4 ; " > $HOME/user-config.jam
fi
fi
./bootstrap.sh --with-toolset=$3
mkdir $1/BOOST
./b2 -j $2 install --prefix=$1/BOOST
rm -rf boost_1_68_0
if [ -f $HOME/user-config.jam_bck ]; then
mv $HOME/user-config.jam_bck $HOME/user-config.jam
fi
rm -rf boost_1_68_0.tar.bz2
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