commit: 3eb27da9879a22e3807426a8fcdd9c56b618acd5 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Wed Oct 1 21:15:51 2025 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Oct 6 15:59:19 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3eb27da9
check for /usr/lib/distcc/bin or /usr/lib/distcc The distcc masquerade directory was moved from for better upstream compat. Bug: https://bugs.gentoo.org/650986 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> lib/portage/package/ebuild/doebuild.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py index 09fab05154..805cd3d376 100644 --- a/lib/portage/package/ebuild/doebuild.py +++ b/lib/portage/package/ebuild/doebuild.py @@ -631,7 +631,10 @@ def doebuild_environment( for feature, m in masquerades: for l in possible_libexecdirs: - p = os.path.join(os.sep, eprefix_lstrip, "usr", l, m, "bin") + masqdir = os.path.join(os.sep, eprefix_lstrip, "usr", l, m) + p = os.path.join(masqdir, "bin") + if not os.path.isdir(p): + p = masqdir if os.path.isdir(p): mysettings["PATH"] = p + ":" + mysettings["PATH"] break
