diff options
| author | Jason Stubbs <jstubbs@gentoo.org> | 2005-10-05 16:21:31 +0000 |
|---|---|---|
| committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-10-05 16:21:31 +0000 |
| commit | 229cd780802a6c8d3cdde7db1333b4ec39f23327 (patch) | |
| tree | a55fa268a6dba9849078fe0c42196504a67654b2 | |
| parent | 1ffe6759c8e9bfec462a72cdbaf60a07c7a2f670 (diff) | |
| download | portage-229cd780802a6c8d3cdde7db1333b4ec39f23327.tar.gz portage-229cd780802a6c8d3cdde7db1333b4ec39f23327.tar.bz2 portage-229cd780802a6c8d3cdde7db1333b4ec39f23327.zip | |
Exclude distcc and and ccache setup from the "setup" phase. Also make the redundant CCACHE_DIR default match what the python side sets.
svn path=/main/branches/2.0/; revision=2101
| -rwxr-xr-x | bin/ebuild.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index c06876eaa..7187cb81b 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1669,7 +1669,7 @@ remove_path_entry() { # === === === === === functions end, main part begins === === === === === # === === === === === === === === === === === === === === === === === === -if [ "$*" != "depend" ] && [ "$*" != "clean" ]; then +if [ "$*" != "depend" ] && [ "$*" != "clean" ] && [ "$*" != "setup" ]; then cd ${PORTAGE_TMPDIR} &> /dev/null cd ${BUILD_PREFIX} &> /dev/null @@ -1705,7 +1705,7 @@ if [ "$*" != "depend" ] && [ "$*" != "clean" ]; then export PATH="/usr/bin/ccache:${PATH}" fi - [ -z "${CCACHE_DIR}" ] && export CCACHE_DIR="/root/.ccache" + [ -z "${CCACHE_DIR}" ] && export CCACHE_DIR="/var/tmp/ccache" addread "${CCACHE_DIR}" addwrite "${CCACHE_DIR}" @@ -1726,7 +1726,7 @@ killparent() { } trap "killparent" INT -fi # "$*"!="depend" && "$*"!="clean" +fi # "$*"!="depend" && "$*"!="clean" && "$*" != "setup" export SANDBOX_ON="1" export S=${WORKDIR}/${P} |