Index: ebuild.sh =================================================================== RCS file: /var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v retrieving revision 1.210 diff -u -1 -b -p -r1.210 ebuild.sh --- ebuild.sh 22 Nov 2004 11:59:32 -0000 1.210 +++ ebuild.sh 25 Dec 2004 04:29:46 -0000 @@ -539,4 +539,9 @@ execute_phases() { elif type -p distcc &>/dev/null; then - export CC="distcc $CC" - export CXX="distcc $CXX" + if [ -n "$(eval echo \${CFLAGS_${ABI}})" ]; then + export CC="distcc ${CC} $(eval echo \${CFLAGS_${ABI}})" + export CXX="distcc ${CXX} $(eval echo \${CFLAGS_${ABI}})" + else + export CC="distcc ${CC}" + export CXX="distcc ${CXX}" + fi fi