solenv/gbuild/Output.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 04d1edf486b638ac574df7b5f4f97c4b127b027a
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Tue May 28 14:34:40 2024 +0200
Commit: Balazs Varga <balazs.varga.ext...@allotropia.de>
CommitDate: Wed Oct 2 19:49:43 2024 +0200
wsl-as-helper: enable gb_COLOR by default when using git-bash
Change-Id: I3c24e8b3049e9bd669952ac3b24678bb3c5e1014
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174258
Tested-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index c4b992df4443..2a5f067684ef 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -52,7 +52,8 @@ gb_Output_BELL := $(shell echo|awk 'BEGIN { printf "%c", 7 }'
-)
ifeq ($(origin gb_COLOR),undefined)
ifneq ($(MAKE_TERMOUT),)
# Cygwin mintty has issues where gb_Output_error is swallowed
-ifneq ($(OS),WNT)
+# but git-bash/wsl-as-helper seems fine with it
+ifneq ($(OS)$(MSYSTEM),WNT)
gb_COLOR=$(true)
endif
endif
