https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Index: ChangeLog from Roland Levillain <roland@lrde.epita.fr> Fix Olena's ICC build on brasilia. * buildfarm_worker/brasilia.fns (test_olena_tree): Fix the name of the variable holding the name of the C++ compiler. brasilia.fns | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) Index: buildfarm_worker/brasilia.fns --- buildfarm_worker/brasilia.fns (revision 357) +++ buildfarm_worker/brasilia.fns (working copy) @@ -23,7 +23,11 @@ export CPPFLAGS="-D_LINUX -I$icc_dir/include/c++/" export LDFLAGS="-cxxlib-icc" export LD_LIBRARY_PATH="$icc_dir/lib:`printenv LD_LIBRARY_PATH`" - export PATH="$icc_dir/bin:$PATH" + # The directory ~/bin contains replacement wrappers for icc and icpc, + # because the installation of ICC on the lrde account is broken since + # the reorganization of the accounts (the lrde account has been moved + # from /home/lrde/admin/lrde to /lrde/beyrouth/admin/lrde). + export PATH="$HOME/bin:$icc_dir/bin:$PATH" } @@ -77,7 +81,7 @@ tree=$1 cxx_compiler=$2 # Use ccache. - export CXX="ccache $cxx-compiler" + export CXX="ccache $cxx_compiler" # ICC-specific initializations, if needed. if test "x$cxx_compiler" = xicpc; then init_icc_vars