* oln_master.cfg (f_oln_unix_icc_10, f_oln_unix_icc_11): Here. --- buildbot/masters/ChangeLog | 6 ++++++ buildbot/masters/oln_master.cfg | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/buildbot/masters/ChangeLog b/buildbot/masters/ChangeLog index 2ab90f1..5e09d11 100644 --- a/buildbot/masters/ChangeLog +++ b/buildbot/masters/ChangeLog @@ -1,5 +1,11 @@ 2010-08-03 Roland Levillain <roland(a)lrde.epita.fr> + Add distcheck_configure_args to Olena ICC builds. + + * oln_master.cfg (f_oln_unix_icc_10, f_oln_unix_icc_11): Here. + +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. diff --git a/buildbot/masters/oln_master.cfg b/buildbot/masters/oln_master.cfg index 63ea480..be473f5 100644 --- a/buildbot/masters/oln_master.cfg +++ b/buildbot/masters/oln_master.cfg @@ -184,7 +184,12 @@ f_oln_unix_icc_10 = GNUBuildSystem(project_repos='olena', extra_ld_library_path=\ ":".join(['/lrde/dev/linux-x86/stable/gdcm/lib', # Path set by ICC 10.1's `iccvars.sh'. - '/lrde/dev/linux-x86/intel/icc10.1//lib']) + '/lrde/dev/linux-x86/intel/icc10.1//lib']), + distcheck_configure_args='CC="/lrde/dev/linux-x86/intel/icc10.1//bin/icc" \ + CXX="/lrde/dev/linux-x86/intel/icc10.1//bin/icpc" \ + --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ + --without-magickxx \ + --enable-all' ) f_oln_unix_icc_11 = GNUBuildSystem(project_repos='olena', @@ -209,7 +214,12 @@ f_oln_unix_icc_11 = GNUBuildSystem(project_repos='olena', # Paths set by ICC 11.0's `iccvars.sh'. '/lrde/dev/linux-x86/intel/Compiler/11.0/081/lib/ia32', '/lrde/dev/linux-x86/intel/Compiler/11.0/081/mkl/lib/32', - '/lrde/dev/linux-x86/intel/Compiler/11.0/081/tbb/ia32/cc4.1.0_libc2.4_kernel2.6.16.21/lib']) + '/lrde/dev/linux-x86/intel/Compiler/11.0/081/tbb/ia32/cc4.1.0_libc2.4_kernel2.6.16.21/lib']), + distcheck_configure_args='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" \ + --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ + --without-magickxx \ + --enable-all' ) -- 1.5.6.5