diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-02-18 15:14:15 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-02-18 17:10:42 +0100 |
| commit | 051d0ccc16954ec423f91ac148e34ce3bff7aca4 (patch) | |
| tree | 447c47a712712d1ab09c10ccc95505e557676548 /compilerplugins | |
| parent | af8deb6b21b4e6888267c7fe385a102e2e7eba77 (diff) | |
make Makefile-clang.mk also use gb_Output_announce
So that the output is consistent, even though the actual build handling
is different.
Change-Id: I460dfe4c2ac74515cc1b598d47e119eb249b8277
Reviewed-on: https://gerrit.libreoffice.org/67972
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'compilerplugins')
| -rw-r--r-- | compilerplugins/Makefile-clang.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk index 91a811a74eda..36784fbb4f14 100644 --- a/compilerplugins/Makefile-clang.mk +++ b/compilerplugins/Makefile-clang.mk @@ -24,6 +24,9 @@ endif # The uninteresting rest. +include $(SRCDIR)/solenv/gbuild/gbuild.mk +include $(SRCDIR)/solenv/gbuild/Output.mk + CLANG_COMMA :=, ifeq ($(OS),WNT) @@ -106,7 +109,7 @@ ifeq ($(OS),WNT) define clangbuildsrc $(3): $(2) $(SRCDIR)/compilerplugins/Makefile-clang.mk $(CLANGOUTDIR)/clang-timestamp - @echo [build CXX] $(subst $(SRCDIR)/,,$(2)) + $$(call gb_Output_announce,$(subst $(SRCDIR)/,,$(2)),$(true),CXX,3) $(QUIET)$(COMPILER_PLUGINS_CXX) $(CLANGCXXFLAGS) $(CLANGWERROR) $(CLANGDEFS) \ $(CLANGINCLUDES) /I$(BUILDDIR)/config_host $(2) /MD \ /c /Fo: $(3) @@ -121,7 +124,7 @@ else define clangbuildsrc $(3): $(2) $(SRCDIR)/compilerplugins/Makefile-clang.mk $(CLANGOUTDIR)/clang-timestamp - @echo [build CXX] $(subst $(SRCDIR)/,,$(2)) + $$(call gb_Output_announce,$(subst $(SRCDIR)/,,$(2)),$(true),CXX,3) $(QUIET)$(COMPILER_PLUGINS_CXX) $(CLANGCXXFLAGS) $(CLANGWERROR) $(CLANGDEFS) $(CLANGINCLUDES) -I$(BUILDDIR)/config_host $(2) -fPIC -c -o $(3) -MMD -MT $(3) -MP -MF $(CLANGOUTDIR)/$(1).d -include $(CLANGOUTDIR)/$(1).d @@ -135,7 +138,7 @@ endif $(foreach src, $(CLANGSRC), $(eval $(call clangbuildsrc,$(src),$(CLANGINDIR)/$(src),$(CLANGOUTDIR)/$(src:.cxx=.o)))) $(CLANGOUTDIR)/plugin$(CLANG_DL_EXT): $(CLANGOBJS) - @echo [build LNK] $(subst $(BUILDDIR)/,,$@) + $(call gb_Output_announce,$(subst $(BUILDDIR)/,,$@),$(true),LNK,4) ifeq ($(OS),WNT) $(QUIET)$(COMPILER_PLUGINS_CXX) /LD $(CLANGOBJS) /Fe: $@ $(CLANGLIBDIR)/clang.lib \ mincore.lib version.lib /link $(COMPILER_PLUGINS_CXX_LINKFLAGS) |