diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-04-26 14:53:17 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-04-26 21:44:23 +0200 |
| commit | a1e5496e4daf469840d5bcc31fede4d4d66aebfe (patch) | |
| tree | a170c3b2242c0be534cd7511124b40a1065fae6d | |
| parent | 752ea376b0a1ee50c97ecc061d8bc507416838d0 (diff) | |
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+LibreOffice@googlemail.com>
| -rw-r--r-- | solenv/gbuild/Trace.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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) |