diff options
| author |   Oskari Pirhonen <xxc3ncoredxx@gmail.com> | 2023-08-12 22:11:15 -0500 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-08-19 16:05:19 +0100 |
| commit | 87d0a7447f1464157f18a8ba0991719777003325 (patch) | |
| tree | e00e732e0c4c39ee7507f24d5477da3223596de2 | |
| parent | emerge-webrsync: drop dead --keyserver code (diff) | |
| download | portage-87d0a7447f1464157f18a8ba0991719777003325.tar.gz portage-87d0a7447f1464157f18a8ba0991719777003325.tar.bz2 portage-87d0a7447f1464157f18a8ba0991719777003325.zip | |
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@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | lib/portage/package/ebuild/doebuild.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py index 8b65a7862..4d4e674c4 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): |