* oln_master.cfg (f_oln_unix_icc_10, f_oln_unix_icc_11): Here. --- buildbot/masters/ChangeLog | 6 ++++++ buildbot/masters/oln_master.cfg | 12 ++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/buildbot/masters/ChangeLog b/buildbot/masters/ChangeLog index effb962..2ab90f1 100644 --- a/buildbot/masters/ChangeLog +++ b/buildbot/masters/ChangeLog @@ -1,3 +1,9 @@ +2010-08-03 Roland Levillain <roland(a)lrde.epita.fr> + + Set CC and CXX to the actual ICC paths in Olena ICC builds. + + * oln_master.cfg (f_oln_unix_icc_10, f_oln_unix_icc_11): Here. + 2010-08-02 Roland Levillain <roland(a)lrde.epita.fr> Remove useless configure options in the Olena Mac OS X/PowerPC build. diff --git a/buildbot/masters/oln_master.cfg b/buildbot/masters/oln_master.cfg index 829e0bd..63ea480 100644 --- a/buildbot/masters/oln_master.cfg +++ b/buildbot/masters/oln_master.cfg @@ -168,9 +168,11 @@ f_oln_unix_icc_10 = GNUBuildSystem(project_repos='olena', project_name='olena', scm_step=checkout, branch=mybranch, + # CC and CXX variables are set to the path of ICC 10.1 to ensure + # this very version will be used. configure_cmd='source /lrde/dev/linux-x86/intel/icc10.1/bin/iccvars.sh\ - && CC="icc" \ - CXX="icpc" \ + && CC="/lrde/dev/linux-x86/intel/icc10.1//bin/icc" \ + CXX="/lrde/dev/linux-x86/intel/icc10.1//bin/icpc" \ ./configure \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ --without-magickxx \ @@ -189,9 +191,11 @@ f_oln_unix_icc_11 = GNUBuildSystem(project_repos='olena', project_name='olena', scm_step=checkout, branch=mybranch, + # CC and CXX variables are set to the path of ICC 11 to ensure this + # very version will be used. configure_cmd='source /lrde/dev/linux-x86/intel/Compiler/11.0/081/bin/iccvars.sh ia32 \ - && CC="icc" \ - CXX="icpc" \ + && CC="/lrde/dev/linux-x86/intel/Compiler/11.0/081/bin/ia32/icc" \ + CXX="/lrde/dev/linux-x86/intel/Compiler/11.0/081/bin/ia32/icpc" \ ./configure \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ --without-magickxx \ -- 1.5.6.5