aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-10-19 21:30:16 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-10-19 21:30:16 +0000
commit0179826b7a56f891a31322693d6a98ec4b19cefa (patch)
treee588dc4d0d26a552fa38858acbb4322f23ae60c8
parente9e0c208e356fa1e766b66ba948a8cb8ed48a609 (diff)
downloadpaludis-0179826b7a56f891a31322693d6a98ec4b19cefa.tar.gz
paludis-0179826b7a56f891a31322693d6a98ec4b19cefa.tar.xz
Check CCACHE_DIR after loading the user bashrc.
-rwxr-xr-xpaludis/repositories/e/ebuild/ebuild.bash5
1 files changed, 4 insertions, 1 deletions
diff --git a/paludis/repositories/e/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash
index aa871ae..4b27226 100755
--- a/paludis/repositories/e/ebuild/ebuild.bash
+++ b/paludis/repositories/e/ebuild/ebuild.bash
@@ -41,7 +41,6 @@ if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] ; then
export SANDBOX_WRITE="${SANDBOX_WRITE}/dev/shm:/dev/stdout:/dev/stderr:/dev/null:/dev/tty:/dev/pts"
export SANDBOX_WRITE="${SANDBOX_WRITE}:${PALUDIS_TMPDIR}:/var/cache"
export SANDBOX_WRITE="${SANDBOX_WRITE}:/proc/self/attr:/proc/self/task:/selinux/context"
- [[ -n "${CCACHE_DIR}" ]] && export SANDBOX_WRITE="${SANDBOX_WRITE}:${CCACHE_DIR}"
export SANDBOX_ON="1"
export SANDBOX_BASHRC="/dev/null"
unset BASH_ENV
@@ -189,6 +188,10 @@ for var in ${save_base_vars} ; do
eval "export ${var}=\"\${save_var_${var}} \$$(echo ${var})\""
done
+if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] ; then
+ [[ -n "${CCACHE_DIR}" ]] && export SANDBOX_WRITE="${SANDBOX_WRITE}:${CCACHE_DIR}"
+fi
+
[[ -z "${CBUILD}" ]] && export CBUILD="${CHOST}"
export REAL_CHOST="${CHOST}"