commit: 87d0a7447f1464157f18a8ba0991719777003325 Author: Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com> AuthorDate: Sun Aug 13 03:11:15 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Aug 19 15:05:19 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=87d0a744
doebuild: gate -Oline behind MAKEFLAGS check Add a check to see if MAKEFLAGS is set (alongside the existing MAKEOPTS and GNUMAKEFLAGS checks) before enabling output synchronization. This is only tangentially related to the bug below via being a (likely rare) case of MAKEFLAGS being set in the wild. Bug: https://bugs.gentoo.org/909009 Signed-off-by: Oskari Pirhonen <xxc3ncoredxx <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> lib/portage/package/ebuild/doebuild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py index 8b65a7862f..4d4e674c4b 100644 --- a/lib/portage/package/ebuild/doebuild.py +++ b/lib/portage/package/ebuild/doebuild.py @@ -589,7 +589,7 @@ def doebuild_environment( nproc = get_cpu_count() if nproc: mysettings["MAKEOPTS"] = "-j%d" % (nproc) - if "GNUMAKEFLAGS" not in mysettings: + if "GNUMAKEFLAGS" not in mysettings and "MAKEFLAGS" not in mysettings: mysettings["GNUMAKEFLAGS"] = "--output-sync=line" if not eapi_exports_KV(eapi):
