* oln_master.cfg (f_oln_unix_icc_10, f_oln_unix_icc_11): Here. Disable Automake's automatic dependency tracking, which does not work well with ccache and icpc. --- buildbot/masters/ChangeLog | 8 ++++++++ buildbot/masters/oln_master.cfg | 20 ++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/buildbot/masters/ChangeLog b/buildbot/masters/ChangeLog index 6c535de..99f10ec 100644 --- a/buildbot/masters/ChangeLog +++ b/buildbot/masters/ChangeLog @@ -1,3 +1,11 @@ +2010-10-25 Roland Levillain <roland(a)lrde.epita.fr> + + Use ccache in Olena ICC builds. + + * oln_master.cfg (f_oln_unix_icc_10, f_oln_unix_icc_11): Here. + Disable Automake's automatic dependency tracking, which does not + work well with ccache and icpc. + 2010-07-30 Roland Levillain <roland(a)lrde.epita.fr> Disable the Olena Mac OS X (10.4)-on-PowerPC build (antalya is down). diff --git a/buildbot/masters/oln_master.cfg b/buildbot/masters/oln_master.cfg index 9b584f7..644ee0a 100644 --- a/buildbot/masters/oln_master.cfg +++ b/buildbot/masters/oln_master.cfg @@ -174,9 +174,10 @@ f_oln_unix_icc_10 = GNUBuildSystem(project_repos='olena', # 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="/lrde/dev/linux-x86/intel/icc10.1//bin/icc" \ - CXX="/lrde/dev/linux-x86/intel/icc10.1//bin/icpc" \ + && CC="ccache /lrde/dev/linux-x86/intel/icc10.1//bin/icc" \ + CXX="ccache /lrde/dev/linux-x86/intel/icc10.1//bin/icpc" \ ./configure \ + --disable-dependency-tracking \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ --without-magickxx \ --enable-all', @@ -188,8 +189,9 @@ f_oln_unix_icc_10 = GNUBuildSystem(project_repos='olena', ":".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']), - distcheck_configure_args='CC="/lrde/dev/linux-x86/intel/icc10.1//bin/icc" \ - CXX="/lrde/dev/linux-x86/intel/icc10.1//bin/icpc" \ + distcheck_configure_args='CC="ccache /lrde/dev/linux-x86/intel/icc10.1//bin/icc" \ + CXX="ccache /lrde/dev/linux-x86/intel/icc10.1//bin/icpc" \ + --disable-dependency-tracking \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ --without-magickxx \ --enable-all' @@ -202,9 +204,10 @@ f_oln_unix_icc_11 = GNUBuildSystem(project_repos='olena', # 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="/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" \ + && CC="ccache /lrde/dev/linux-x86/intel/Compiler/11.0/081/bin/ia32/icc" \ + CXX="ccache /lrde/dev/linux-x86/intel/Compiler/11.0/081/bin/ia32/icpc" \ ./configure \ + --disable-dependency-tracking \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ --without-magickxx \ --enable-all', @@ -218,8 +221,9 @@ f_oln_unix_icc_11 = GNUBuildSystem(project_repos='olena', '/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']), - 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" \ + distcheck_configure_args='CC="ccache /lrde/dev/linux-x86/intel/Compiler/11.0/081/bin/ia32/icc" \ + CXX="ccache /lrde/dev/linux-x86/intel/Compiler/11.0/081/bin/ia32/icpc" \ + --disable-dependency-tracking \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ --without-magickxx \ --enable-all' -- 1.5.6.5