solenv/gbuild/Trace.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit a1e5496e4daf469840d5bcc31fede4d4d66aebfe Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> AuthorDate: Fri Apr 26 14:53:17 2024 +0200 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Fri Apr 26 21:44:23 2024 +0200 gbuild trace: disable flock for wsl-as-helper case Change-Id: Ie5db3fcc6fccedb214aec472852d8d82813fb984 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166744 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/solenv/gbuild/Trace.mk b/solenv/gbuild/Trace.mk index a92f842e1dec..d1cba301469e 100644 --- a/solenv/gbuild/Trace.mk +++ b/solenv/gbuild/Trace.mk @@ -37,7 +37,7 @@ ifneq ($(gb_TRACE),) gb_Trace_Timestamp := $(if $(filter MACOSX,$(OS)),$$(date +%s)000000000,$$(date +%s%N)) # macOS also doesn't provide flock, so skip that part on mac # The (flock;cat) part is to minimize lock time. -gb_Trace_Flock := $(if $(filter MACOSX,$(OS)),,| ( flock 1; cat )) +gb_Trace_Flock := $(if $(MSYSTEM)$(filter MACOSX,$(OS)),,| ( flock 1; cat )) # call gb_Trace_AddMark,marktype,detail,type,extra define gb_Trace__AddMark echo "{\"name\": \"$(3)\", \"ph\": \"$(1)\", \"pid\": 1, \"tid\": 1, \"ts\": $(gb_Trace_Timestamp),\"args\":{\"message\":\"[$(3)]: $(2)\"}}," $(gb_Trace_Flock) >>$(gb_TRACE)