diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2023-10-20 12:07:06 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2023-10-20 15:45:35 +0200 |
| commit | e106b8658068bd8c5d1ef2da1bf2dc1dc352a4ab (patch) | |
| tree | 29080a27eb819ee1ed8e5782987081be5ab5ebd6 /solenv | |
| parent | bcbc1051c72dc16dd16dbb86b21ca4d731be34b8 (diff) | |
fix make GBUILD_TRACE=/path/to/log.json for non-mac
my previous patch to make it work on mac (
4b67515418ee4f10071b3f0f2275ba37f32b0ae5 ) actually broke the
timestamping for other platforms, as the date command no longer was
treated as a shell-subcommand due to the lack of the additional $ to
quote the statement.. Oups.
But at least fixed within a year, people need to use it more! :-))
Change-Id: Id4e20fb11540824555ce4c04d3abed55be9185c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158236
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'solenv')
| -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 5ff0d0bf4ded..8fc8336f7cdb 100644 --- a/solenv/gbuild/Trace.mk +++ b/solenv/gbuild/Trace.mk @@ -30,7 +30,7 @@ endif ifneq ($(gb_TRACE),) # macOS date doesn't know about nanoseconds switch, and instead of resorting to perl or python # to create a millisecond timestamp, just avoid the overhead and live with seconds-only accuracy -gb_Trace_Timestamp := $(if $(filter MACOSX,$(OS)),$$(date +%s)000000000,$(date +%s%N)) +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 )) |