solenv/gbuild/Output.mk | 7 +++++--
solenv/gbuild/platform/unxgcc.mk | 5 ++++-
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 9e8c1da64fa8a520730ce0aea0f7199cd75c892f
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Mon Dec 27 21:31:38 2021 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Tue Dec 28 00:00:01 2021 +0100
gbuild: announce date when acquiring the link lock
Must use echo, because we're in the shell at this point.
Change-Id: I576ae2afe743b11a11bc776e5fa19a1904bbd1fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127610
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index 4fbefdea57a7..4e3b5b92ef22 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -146,9 +146,12 @@ $(info $(gb_Output_BELL)$(gb_Output_ESCAPE)[A)
endef
endif
-define gb_Output_announce
-$(info $(call gb_Output__format_type,$(2),$(3),$(4)) $(call
gb_Output__format_target,$(1)))
+define gb_Output_announce_str
+$(call gb_Output__format_type,$(2),$(3),$(4)) $(call
gb_Output__format_target,$(1))
endef
+define gb_Output_announce
+$(info $(call gb_Output_announce_str,$(1),$(2),$(3),$(4)))
+endef
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 2aba54f2bca1..94402183eb02 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -122,7 +122,10 @@ gb_LinkTarget__NeedsCxxLinker = $(if
$(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTL
# libclang_rt.ubsan_cxx-x86_64.a, and oosplash links against sal but itself
only
# contains .c sources:
define gb_LinkTarget__command_dynamiclink
-$(if $(call gb_LinkTarget__WantLock,$2),$(gb_LinkTarget__cmd_lockfile) -r -1
$(gb_LinkTarget__Lock))
+$(if $(call gb_LinkTarget__WantLock,$2), \
+ $(gb_LinkTarget__cmd_lockfile) -r -1 $(gb_LinkTarget__Lock) ; \
+ echo "$(call gb_Output_announce_str,$(2): got link lock at $$(date
-u),$(true),LNK,5)" \
+)
$(call gb_Helper_abbreviate_dirs,\
$(if $(call gb_LinkTarget__NeedsCxxLinker),$(or $(T_CXX),$(gb_CXX))
$(gb_CXX_LINKFLAGS),$(or $(T_CC),$(gb_CC))) \
$(if $(filter Library
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
