* 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, 16 insertions(+), 2 deletions(-) diff --git a/buildbot/masters/ChangeLog b/buildbot/masters/ChangeLog index ea9c371..6f56762 100644 --- a/buildbot/masters/ChangeLog +++ b/buildbot/masters/ChangeLog @@ -1,3 +1,9 @@ +2010-07-30 Roland Levillain <roland(a)lrde.epita.fr> + + Preserve LD_LIBRARY_PATH in Olena ICC builds. + + * oln_master.cfg (f_oln_unix_icc_10, f_oln_unix_icc_11): Here. + 2010-07-22 Roland Levillain <roland(a)lrde.epita.fr> Disable the use of Magick++ on most Olena builds (cont.). diff --git a/buildbot/masters/oln_master.cfg b/buildbot/masters/oln_master.cfg index 4845d3b..7f5a19f 100644 --- a/buildbot/masters/oln_master.cfg +++ b/buildbot/masters/oln_master.cfg @@ -180,7 +180,10 @@ f_oln_unix_icc_10 = GNUBuildSystem(project_repos='olena', install_cmd=None, dist_cmd=None, upload_cmd=None, - extra_ld_library_path='/lrde/dev/linux-x86/stable/gdcm/lib' + 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']) ) f_oln_unix_icc_11 = GNUBuildSystem(project_repos='olena', @@ -199,7 +202,12 @@ f_oln_unix_icc_11 = GNUBuildSystem(project_repos='olena', install_cmd=None, dist_cmd=None, upload_cmd=None, - extra_ld_library_path='/lrde/dev/linux-x86/stable/gdcm/lib' + extra_ld_library_path=\ + ":".join(['/lrde/dev/linux-x86/stable/gdcm/lib', + # 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']) ) -- 1.5.6.5