tools build: Fix quiet cmd indentation
The tools quiet cmd output has mismatched indentation (and extra space character between cmd name and target name) compared to the rest of kbuild out: HOSTCC scripts/insert-sys-cert LD /srv/code/tools/objtool/arch/x86/objtool-in.o LD /srv/code/tools/objtool/libsubcmd-in.o AR /srv/code/tools/objtool/libsubcmd.a HOSTLD scripts/genksyms/genksyms CC scripts/mod/empty.o HOSTCC scripts/mod/mk_elfconfig CC scripts/mod/devicetable-offsets.s MKELF scripts/mod/elfconfig.h HOSTCC scripts/mod/modpost.o HOSTCC scripts/mod/file2alias.o HOSTCC scripts/mod/sumversion.o LD /srv/code/tools/objtool/objtool-in.o LINK /srv/code/tools/objtool/objtool HOSTLD scripts/mod/modpost CC kernel/bounds.s Adjust to match the rest of kbuild. Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Родитель
d07f6ca923
Коммит
c6de37dd5e
|
@ -51,39 +51,39 @@ subdir-obj-y :=
|
|||
build-file := $(dir)/Build
|
||||
-include $(build-file)
|
||||
|
||||
quiet_cmd_flex = FLEX $@
|
||||
quiet_cmd_bison = BISON $@
|
||||
quiet_cmd_flex = FLEX $@
|
||||
quiet_cmd_bison = BISON $@
|
||||
|
||||
# Create directory unless it exists
|
||||
quiet_cmd_mkdir = MKDIR $(dir $@)
|
||||
quiet_cmd_mkdir = MKDIR $(dir $@)
|
||||
cmd_mkdir = mkdir -p $(dir $@)
|
||||
rule_mkdir = $(if $(wildcard $(dir $@)),,@$(call echo-cmd,mkdir) $(cmd_mkdir))
|
||||
|
||||
# Compile command
|
||||
quiet_cmd_cc_o_c = CC $@
|
||||
quiet_cmd_cc_o_c = CC $@
|
||||
cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
|
||||
|
||||
quiet_cmd_host_cc_o_c = HOSTCC $@
|
||||
quiet_cmd_host_cc_o_c = HOSTCC $@
|
||||
cmd_host_cc_o_c = $(HOSTCC) $(host_c_flags) -c -o $@ $<
|
||||
|
||||
quiet_cmd_cxx_o_c = CXX $@
|
||||
quiet_cmd_cxx_o_c = CXX $@
|
||||
cmd_cxx_o_c = $(CXX) $(cxx_flags) -c -o $@ $<
|
||||
|
||||
quiet_cmd_cpp_i_c = CPP $@
|
||||
quiet_cmd_cpp_i_c = CPP $@
|
||||
cmd_cpp_i_c = $(CC) $(c_flags) -E -o $@ $<
|
||||
|
||||
quiet_cmd_cc_s_c = AS $@
|
||||
quiet_cmd_cc_s_c = AS $@
|
||||
cmd_cc_s_c = $(CC) $(c_flags) -S -o $@ $<
|
||||
|
||||
quiet_cmd_gen = GEN $@
|
||||
quiet_cmd_gen = GEN $@
|
||||
|
||||
# Link agregate command
|
||||
# If there's nothing to link, create empty $@ object.
|
||||
quiet_cmd_ld_multi = LD $@
|
||||
quiet_cmd_ld_multi = LD $@
|
||||
cmd_ld_multi = $(if $(strip $(obj-y)),\
|
||||
$(LD) -r -o $@ $(filter $(obj-y),$^),rm -f $@; $(AR) rcs $@)
|
||||
|
||||
quiet_cmd_host_ld_multi = HOSTLD $@
|
||||
quiet_cmd_host_ld_multi = HOSTLD $@
|
||||
cmd_host_ld_multi = $(if $(strip $(obj-y)),\
|
||||
$(HOSTLD) -r -o $@ $(filter $(obj-y),$^),rm -f $@; $(HOSTAR) rcs $@)
|
||||
|
||||
|
|
|
@ -131,29 +131,29 @@ QUIET_SUBDIR1 =
|
|||
|
||||
ifneq ($(silent),1)
|
||||
ifneq ($(V),1)
|
||||
QUIET_CC = @echo ' CC '$@;
|
||||
QUIET_CC_FPIC = @echo ' CC FPIC '$@;
|
||||
QUIET_CLANG = @echo ' CLANG '$@;
|
||||
QUIET_AR = @echo ' AR '$@;
|
||||
QUIET_LINK = @echo ' LINK '$@;
|
||||
QUIET_MKDIR = @echo ' MKDIR '$@;
|
||||
QUIET_GEN = @echo ' GEN '$@;
|
||||
QUIET_CC = @echo ' CC '$@;
|
||||
QUIET_CC_FPIC = @echo ' CC FPIC '$@;
|
||||
QUIET_CLANG = @echo ' CLANG '$@;
|
||||
QUIET_AR = @echo ' AR '$@;
|
||||
QUIET_LINK = @echo ' LINK '$@;
|
||||
QUIET_MKDIR = @echo ' MKDIR '$@;
|
||||
QUIET_GEN = @echo ' GEN '$@;
|
||||
QUIET_SUBDIR0 = +@subdir=
|
||||
QUIET_SUBDIR1 = ;$(NO_SUBDIR) \
|
||||
echo ' SUBDIR '$$subdir; \
|
||||
echo ' SUBDIR '$$subdir; \
|
||||
$(MAKE) $(PRINT_DIR) -C $$subdir
|
||||
QUIET_FLEX = @echo ' FLEX '$@;
|
||||
QUIET_BISON = @echo ' BISON '$@;
|
||||
QUIET_GENSKEL = @echo ' GEN-SKEL '$@;
|
||||
QUIET_FLEX = @echo ' FLEX '$@;
|
||||
QUIET_BISON = @echo ' BISON '$@;
|
||||
QUIET_GENSKEL = @echo ' GENSKEL '$@;
|
||||
|
||||
descend = \
|
||||
+@echo ' DESCEND '$(1); \
|
||||
+@echo ' DESCEND '$(1); \
|
||||
mkdir -p $(OUTPUT)$(1) && \
|
||||
$(MAKE) $(COMMAND_O) subdir=$(if $(subdir),$(subdir)/$(1),$(1)) $(PRINT_DIR) -C $(1) $(2)
|
||||
|
||||
QUIET_CLEAN = @printf ' CLEAN %s\n' $1;
|
||||
QUIET_INSTALL = @printf ' INSTALL %s\n' $1;
|
||||
QUIET_UNINST = @printf ' UNINST %s\n' $1;
|
||||
QUIET_CLEAN = @printf ' CLEAN %s\n' $1;
|
||||
QUIET_INSTALL = @printf ' INSTALL %s\n' $1;
|
||||
QUIET_UNINST = @printf ' UNINST %s\n' $1;
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче