summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-03-27 04:32:25 +0000
committerZac Medico <zmedico@gentoo.org>2009-03-27 04:32:25 +0000
commitb5ee42c5182049b4d00511905d1cf8eac73b6d04 (patch)
tree694a81724af15cfba75d0c58969da61544483371 /bin
parentIn config.regenerate(), always synchronize self.features with self['FEATURES']. (diff)
downloadportage-multirepo-b5ee42c5182049b4d00511905d1cf8eac73b6d04.tar.gz
portage-multirepo-b5ee42c5182049b4d00511905d1cf8eac73b6d04.tar.bz2
portage-multirepo-b5ee42c5182049b4d00511905d1cf8eac73b6d04.zip
Move checks for /usr/lib/distcc/bin and /usr/lib/ccache/bin to the python
side and don't add distcc to CC and CXX when /usr/lib/distcc/bin doesn't exist since that won't necessarily work. Thanks to Jeroen Roovers <jer@g.o> for reporting the issue with adding distcc to CC. (trunk r13198) svn path=/main/branches/2.1.6/; revision=13219
Diffstat (limited to 'bin')
-rwxr-xr-xbin/ebuild.sh19
1 files changed, 4 insertions, 15 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index f66de9ae..d36c81e0 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1887,26 +1887,15 @@ ebuild_main() {
if ! hasq $EBUILD_SH_ARGS clean depend help info nofetch ; then
if hasq distcc $FEATURES ; then
- if [ -d /usr/lib/distcc/bin ] ; then
- [[ -z ${PATH/*distcc*/} ]] && remove_path_entry distcc
- export PATH="/usr/lib/distcc/bin:$PATH"
- [[ -n $DISTCC_LOG ]] && addwrite "${DISTCC_LOG%/*}"
- elif type -P distcc >/dev/null ; then
- ! hasq distcc $CC && export CC="distcc $CC"
- ! hasq distcc $CXX && export CXX="distcc $CXX"
- fi
+ [[ -z ${PATH/*distcc*/} ]] && remove_path_entry distcc
+ export PATH="/usr/lib/distcc/bin:$PATH"
+ [[ -n $DISTCC_LOG ]] && addwrite "${DISTCC_LOG%/*}"
fi
if hasq ccache $FEATURES ; then
[[ -z ${PATH/*ccache*/} ]] && remove_path_entry ccache
- if [ -d /usr/lib/ccache/bin ] ; then
- export PATH="/usr/lib/ccache/bin:$PATH"
- elif [ -d /usr/bin/ccache ] ; then
- export PATH="/usr/bin/ccache:$PATH"
- fi
-
- [[ -z $CCACHE_DIR ]] && export CCACHE_DIR=/var/tmp/ccache
+ export PATH="/usr/lib/ccache/bin:$PATH"
addread "$CCACHE_DIR"
addwrite "$CCACHE_DIR"