https://svn.lrde.epita.fr/svn/lrde-tools/trunk/build-farm
Index: ChangeLog
from Roland Levillain <roland(a)lrde.epita.fr>
Adjust brasilia.fns for the user `doc'.
* buildfarm_worker/brasilia.fns (init_icc_vars): No longer set
CXXFLAGS.
s,$HOME/bin,/work/build/bin-icc,.
brasilia.fns | 32 ++++++++++++++++++++------------
1 file changed, 20 insertions(+), 12 deletions(-)
Index: buildfarm_worker/brasilia.fns
--- buildfarm_worker/brasilia.fns (revision 368)
+++ buildfarm_worker/brasilia.fns (working copy)
@@ -1,5 +1,7 @@
# brasilia. -*- shell-script -*-
+# Used to compile Olena and Vaucanson.
+
# The ccache dir is located in the /work file system on brasilia. As
# ~/.zshenv is not sourced by the build script, this environment
# variable is defined here.
@@ -9,6 +11,7 @@
# always use GCC for this.
export TIMELIMIT_CC=gcc
+
# INIT_ICC_VARS
# -------------
# Initialize ICC environment variables.
@@ -16,22 +19,27 @@
{
# ICC 9.0 directory.
icc_dir="/lrde/beyrouth/admin/lrde/usr/intel/compiler90"
- # 2006-09-05: ICC 9.0 cannot work with GCC 4.1 installed on the
+
+ export CPPFLAGS="-D_LINUX -I$icc_dir/include/c++/"
+ export LDFLAGS="-cxxlib-icc -i-static"
+ export LD_LIBRARY_PATH="$icc_dir/lib:`printenv LD_LIBRARY_PATH`"
+
+ # The directory /work/build/bin-icc contains replacement wrappers for
+ # icc and icpc, because the installation of ICC on the lrde account
+ # is broken since the reorganization of the accounts (the lrde
+ # account has been moved from /home/lrde/admin/lrde to
+ # /lrde/beyrouth/admin/lrde).
+ #
+ #
+ # Moreover, ICC 9.0 cannot work with GCC 4.1 installed on the
# same host. icpc reports this error:
#
# Command-line error: invalid GNU version number: 412
#
- # So, force ICC to consider GCC 4.0 as the default GCC.
- export CXXFLAGS="-gcc-name=gcc-4.0"
- # Don't use CXXFLAGS, it's CPP and LD stuffs.
- export CPPFLAGS="-D_LINUX -I$icc_dir/include/c++/"
- export LDFLAGS="-cxxlib-icc -i-static"
- export LD_LIBRARY_PATH="$icc_dir/lib:`printenv LD_LIBRARY_PATH`"
- # The directory ~/bin contains replacement wrappers for icc and icpc,
- # because the installation of ICC on the lrde account is broken since
- # the reorganization of the accounts (the lrde account has been moved
- # from /home/lrde/admin/lrde to /lrde/beyrouth/admin/lrde).
- export PATH="$HOME/bin:$icc_dir/bin:$PATH"
+ # Yet GCC 4.1 is the default version of GCC on brasilia. So,
+ # /work/build/bin-icc also contains symlinks for gcc and g++
+ # pointing to the version 4.0 of the GNU C and C++ compilers.
+ export PATH="/work/build/bin-icc:$icc_dir/bin:$PATH"
}