ebuild.sh: fix libdir for ccache/distcc

This will fix bug #355283.

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 9ca41a62a379a0ba674d834aef50f8f5fa5cb18e..8c301d8c9f7f14c9d38484c558f70c5924f7ca18 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -2118,13 +2118,17 @@ if ! hasq "$EBUILD_PHASE" clean cleanrm ; then
                        PATH=$_ebuild_helpers_path:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${ROOTPATH:+:}$ROOTPATH
                        unset _ebuild_helpers_path
 
+                       # Use default ABI libdir in accordance with bug #355283.
+                       x=LIBDIR_${DEFAULT_ABI}
+                       [[ -n $DEFAULT_ABI && -n ${!x} ]] && x=${!x} || x=lib
+
                        if hasq distcc $FEATURES ; then
-                               PATH="/usr/lib/distcc/bin:$PATH"
+                               PATH="/usr/$x/distcc/bin:$PATH"
                                [[ -n $DISTCC_LOG ]] && addwrite "${DISTCC_LOG%/*}"
                        fi
 
                        if hasq ccache $FEATURES ; then
-                               PATH="/usr/lib/ccache/bin:$PATH"
+                               PATH="/usr/$x/ccache/bin:$PATH"
 
                                if [[ -n $CCACHE_DIR ]] ; then
                                        addread "$CCACHE_DIR"
@@ -2134,6 +2138,8 @@ if ! hasq "$EBUILD_PHASE" clean cleanrm ; then
                                [[ -n $CCACHE_SIZE ]] && ccache -M $CCACHE_SIZE &> /dev/null
                        fi
 
+                       unset x
+
                        if [[ -n $QA_PREBUILT ]] ; then
 
                                # these ones support fnmatch patterns