https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix the building of timelimit when using ICC. * buildfarm_worker/brasilia.fns (TIMELIMIT_CC): Set envvar to gcc. * buildfarm_worker/build_test.fns (action_system): Use it when non null. brasilia.fns | 4 ++++ build_test.fns | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) Index: buildfarm_worker/build_test.fns --- buildfarm_worker/build_test.fns (revision 367) +++ buildfarm_worker/build_test.fns (working copy) @@ -301,9 +301,14 @@ ;; esac + # FIXME: Couldn't we avoid building `timelimit' each time? echo "Building timelimit" # Choose the C compiler used to build `timelimit'. - if test -n "$CC"; then + if test -n "$TIMELIMIT_CC"; then + # Use a compiler specified by the user to build timelimit. + timelimit_CC="$TIMELIMIT_CC" + elif test -n "$CC"; then + # Use the chosen C compiler. timelimit_CC="$CC" else # Use the default C compiler. @@ -315,6 +320,7 @@ echo "SYSTEM STATUS: 1" return 1 fi + unset timelimit_CC return 0 } Index: buildfarm_worker/brasilia.fns --- buildfarm_worker/brasilia.fns (revision 367) +++ buildfarm_worker/brasilia.fns (working copy) @@ -5,6 +5,10 @@ # variable is defined here. export CCACHE_DIR=/work/build/var/ccache +# The setup of ICC is enough tedious to avoid it to build `timelimit'; +# always use GCC for this. +export TIMELIMIT_CC=gcc + # INIT_ICC_VARS # ------------- # Initialize ICC environment variables.