CDPP / AMDA_Kernel

Commit 94780bca6c57c46cc776fd39ecc3de4d85b54b37

Authored by Benjamin Renard
2 parents 1ddc0f12 1dff4abb
Exists in master and in 96 other branches 10038, 10098, 5390, 5770, 6728, 7616, 7811, 7875, 8034_7628, 8038, 8041, 8045_8044, 8295, 8459, 8528, 8928, 9016, 9016Bis, 9017, 9017-new, 9049, 9084, 9259, 9326, 9347, 9383, 9719, 9719.new, AllLegends, CDF_ISTP, CDF_ISTP_HOPEFULLY_ALL_WORKING, FER_10400, FER_10412, FER_10663, FER_10765, FER_11000, FER_11100, FER_11242, FER_11277, FER_11500, FER_11537, FER_11588, FER_11651, FER_19836, FER_5344, FER_6031, FER_6598, FER_6966, FER_7318, FER_7618, FER_7857, FER_8455, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, JUNO_JEDI, MAZ_10936, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, SolarOrbiter, SpeasyGet, akka-scatter-multi-xparams, amdadev, amdadev_test, cu2022, das2, density_maps, develop, evol-5638, evol-6371, evol_9042, expression-parser-bre, feature/9259, frames-transformation, pickle, rm_5639, rm_5776, rm_6015, rm_6595, rm_6599, rm_6616, rm_6616_bis, rm_6912, rm_7926, rm_8050, rm_8932, shue, shue97, sum-components-indexes, test-merge, tickplot, ubuntu

Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_Kernel

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
Inline Side-by-side
script/deploy.sh
  Diff comments   View file @94780bc
@@ -41,7 +41,7 @@ else @@ -41,7 +41,7 @@ else
41 fi 41 fi
42 42
43 if [ -d "$COTS_DIR/tools/boost" ]; then 43 if [ -d "$COTS_DIR/tools/boost" ]; then
44 - BOOST_ROOT="$COTS_DIR/tools/boost" 44 + BOOST_ROOT="$COTS_DIR/tools/gcc/4.7.2/boost"
45 else 45 else
46 BOOST_ROOT="/usr" 46 BOOST_ROOT="/usr"
47 fi 47 fi