Prefer LCG compiler with latest binutils

if not found, fall back on the compiler using the system binutils

LbUtils/scripts/.lcg-compiler-wrapper.sh

@@ -6,7 +6,8 @@
 _self=${0##*/}
 
 hostos() {
-    arch=$(uname -i)
+    local arch=$(uname -i)
+    local os vers
     case $(lsb_release -si) in
         ScientificCERNSLC)
             os=slc
@@ -19,26 +20,38 @@ hostos() {
     echo $arch-$os$vers
 }
 
+_platform=${LCG_hostos:-$(hostos)}
+
 set_prefix() {
-    _dirname=$1
-    _version=$2
+    local _dirname=$1
+    local _version=$2
 
-    _platform=${LCG_hostos:-$(hostos)}
+    _prefix=
 
-    for _prefix in ${LCG_releases_base} $(echo ${LCG_release_area} ${LCG_external_area} | tr : ' ') \
+    local _prefix_tmp
+    for _prefix_tmp in ${LCG_releases_base} $(echo ${LCG_release_area} ${LCG_external_area} | tr : ' ') \
                    /cvmfs/sft.cern.ch/lcg/{contrib,external,releases} \
                    /afs/cern.ch/sw/lcg/{contrib,releases,external,experimental} ; do
-        if [ -d "${_prefix}/${_dirname}/${_version}/${_platform}" ] ; then
-            _prefix="${_prefix}/${_dirname}/${_version}/${_platform}"
+        if [ -d "${_prefix_tmp}/${_dirname}/${_version}/${_platform}" ] ; then
+            _prefix="${_prefix_tmp}/${_dirname}/${_version}/${_platform}"
             break
         fi
     done
 }
 
 setup_gcc() {
-        _version=$1
+        local _version=$1
+
+        set_prefix gcc ${_version}binutils
+        if [ -n "${_prefix}" ] ; then
+          # we found a build of the compiler that uses new binutils
+          # FIXME: new binutils require an extra entry in the LD_LIBRARY_PATH...
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}/cvmfs/sft.cern.ch/lcg/contrib/bintuils/2.28/${_platform}/lib
+        else
+          # fall back to a compiler with system binutils
+          set_prefix gcc ${_version}
+        fi
 
-        set_prefix gcc ${_version}
 
         _bin="${_prefix}/bin"
         _lib="${_prefix}/lib64"

[Ben Couturier]

is local bash or sh. Not sure whether it matters these days....