From b3b4d143a6e27c455f9d06edb2847442d9b0a3ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= <florian@queze.net>
Date: Fri, 26 Apr 2024 05:30:50 +0000
Subject: [PATCH] Bug 1859011 - avoid prefixing BUILDSTATUS lines, r=glandium.

Differential Revision: https://phabricator.services.mozilla.com/D208580
---
 build/moz-automation.mk  | 4 +---
 config/run-and-prefix.py | 5 ++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build/moz-automation.mk b/build/moz-automation.mk
index 5e165228eda0..efb658867fba 100644
--- a/build/moz-automation.mk
+++ b/build/moz-automation.mk
@@ -29,9 +29,7 @@ MOZ_AUTOMATION_CHECK := 0
 endif
 
 ifneq (,$(filter automation/%,$(MAKECMDGOALS)))
-ifeq (4.0,$(firstword $(sort 4.0 $(MAKE_VERSION))))
-MAKEFLAGS += --output-sync=target
-else
+ifneq (4.0,$(firstword $(sort 4.0 $(MAKE_VERSION))))
 .NOTPARALLEL:
 endif
 endif
diff --git a/config/run-and-prefix.py b/config/run-and-prefix.py
index af27e6743bca..14f0711a098b 100644
--- a/config/run-and-prefix.py
+++ b/config/run-and-prefix.py
@@ -31,6 +31,9 @@ while True:
     if data == b"":
         break
 
-    sys.stdout.write(b"%s> %s" % (prefix, data))
+    if data.startswith(b"BUILDSTATUS"):
+        sys.stdout.write(data)
+    else:
+        sys.stdout.write(b"%s> %s" % (prefix, data))
 
 sys.exit(p.wait())