commit: 878eddfea083eda5aea60510aa1c4e9145f26b99
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 18 19:22:17 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 18 19:22:17 2020 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=878eddfe
Revert "doebuild: Use ccache/distcc/icecream only in src_* phases"
This breaks ccache/etc. entirely as they are no longer present in PATH
in later phases.
Reverts: 61f76236aa10c297f79c2fee123a79d26bfa9327
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
lib/portage/package/ebuild/doebuild.py | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/lib/portage/package/ebuild/doebuild.py
b/lib/portage/package/ebuild/doebuild.py
index 1343eca6d..2bff94cb1 100644
--- a/lib/portage/package/ebuild/doebuild.py
+++ b/lib/portage/package/ebuild/doebuild.py
@@ -486,14 +486,7 @@ def doebuild_environment(myebuild, mydo, myroot=None,
settings=None,
distcc = "distcc" in mysettings.features
icecream = "icecream" in mysettings.features
- # run cc thingies only in src_* phases as otherwise they might
- # create files with incorrect ownership and trip over
- # (NB: install has a similar issue but 1) some badly written
- # packages rebuild stuff there, so ccache is very helpful
- # and 2) almost always some compilation will happen earlier,
- # so permissions will be already set correctly)
- if (ccache or distcc or icecream) and mydo in ('unpack',
- 'prepare', 'configure', 'test', 'install'):
+ if ccache or distcc or icecream:
libdir = None
default_abi = mysettings.get("DEFAULT_ABI")
if default_abi:
