[tip:,objtool/core] objtool: Properly support make V=1
Commit Message
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 8c4526ca6a45e7ff915c2b33b54db6b773291fac
Gitweb: https://git.kernel.org/tip/8c4526ca6a45e7ff915c2b33b54db6b773291fac
Author: Ian Rogers <irogers@google.com>
AuthorDate: Thu, 26 Jan 2023 11:06:05 -08:00
Committer: Josh Poimboeuf <jpoimboe@kernel.org>
CommitterDate: Mon, 30 Jan 2023 16:28:16 -08:00
objtool: Properly support make V=1
The Q variable was being used but never correctly set up. Add the
setting up and use in place of @.
Signed-off-by: Ian Rogers <irogers@google.com>
Link: https://lore.kernel.org/r/20230126190606.40739-3-irogers@google.com
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
tools/objtool/Makefile | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
@@ -45,6 +45,12 @@ CFLAGS += $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED)
AWK = awk
MKDIR = mkdir
+ifeq ($(V),1)
+ Q =
+else
+ Q = @
+endif
+
BUILD_ORC := n
ifeq ($(SRCARCH),x86)
@@ -56,18 +62,18 @@ export srctree OUTPUT CFLAGS SRCARCH AWK
include $(srctree)/tools/build/Makefile.include
$(OBJTOOL_IN): fixdep FORCE
- @$(CONFIG_SHELL) ./sync-check.sh
- @$(MAKE) $(build)=objtool
+ $(Q)$(CONFIG_SHELL) ./sync-check.sh
+ $(Q)$(MAKE) $(build)=objtool
$(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN)
$(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@
$(LIBSUBCMD_OUTPUT):
- @$(MKDIR) -p $@
+ $(Q)$(MKDIR) -p $@
$(LIBSUBCMD): fixdep $(LIBSUBCMD_OUTPUT) FORCE
- @$(MAKE) -C $(LIBSUBCMD_DIR) O=$(LIBSUBCMD_OUTPUT) \
+ $(Q)$(MAKE) -C $(LIBSUBCMD_DIR) O=$(LIBSUBCMD_OUTPUT) \
DESTDIR=$(LIBSUBCMD_OUTPUT) prefix= subdir= \
$@ install_headers