History

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.

Kees Cook committed 5 years ago

Commit c6de37d1 parent d07f6ca2 files · +26 −26Browse files

Unified · Split

2 files
  1. tools/build/Makefile.build +11 −11
  2. tools/scripts/Makefile.include +15 −15
tools/build/Makefile.build+11−11
@@ -51,39 +51,39 @@ subdir-obj-y := · 50 unmodified lines
5151 build-file := $(dir)/Build
5252 -include $(build-file)
5353
54−quiet_cmd_flex = FLEX $@
55−quiet_cmd_bison = BISON $@
54+quiet_cmd_flex = FLEX $@
55+quiet_cmd_bison = BISON $@
5656
5757 # Create directory unless it exists
58−quiet_cmd_mkdir = MKDIR $(dir $@)
58+quiet_cmd_mkdir = MKDIR $(dir $@)
5959 cmd_mkdir = mkdir -p $(dir $@)
6060 rule_mkdir = $(if $(wildcard $(dir $@)),,@$(call echo-cmd,mkdir) $(cmd_mkdir))
6161
6262 # Compile command
63−quiet_cmd_cc_o_c = CC $@
63+quiet_cmd_cc_o_c = CC $@
6464 cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
6565
66−quiet_cmd_host_cc_o_c = HOSTCC $@
66+quiet_cmd_host_cc_o_c = HOSTCC $@
6767 cmd_host_cc_o_c = $(HOSTCC) $(host_c_flags) -c -o $@ $<
6868
69−quiet_cmd_cxx_o_c = CXX $@
69+quiet_cmd_cxx_o_c = CXX $@
7070 cmd_cxx_o_c = $(CXX) $(cxx_flags) -c -o $@ $<
7171
72−quiet_cmd_cpp_i_c = CPP $@
72+quiet_cmd_cpp_i_c = CPP $@
7373 cmd_cpp_i_c = $(CC) $(c_flags) -E -o $@ $<
7474
75−quiet_cmd_cc_s_c = AS $@
75+quiet_cmd_cc_s_c = AS $@
7676 cmd_cc_s_c = $(CC) $(c_flags) -S -o $@ $<
7777
78−quiet_cmd_gen = GEN $@
78+quiet_cmd_gen = GEN $@
7979
8080 # Link agregate command
8181 # If there's nothing to link, create empty $@ object.
82−quiet_cmd_ld_multi = LD $@
82+quiet_cmd_ld_multi = LD $@
8383 cmd_ld_multi = $(if $(strip $(obj-y)),\
8484 $(LD) -r -o $@ $(filter $(obj-y),$^),rm -f $@; $(AR) rcs $@)
8585
86−quiet_cmd_host_ld_multi = HOSTLD $@
86+quiet_cmd_host_ld_multi = HOSTLD $@
8787 cmd_host_ld_multi = $(if $(strip $(obj-y)),\
8888 $(HOSTLD) -r -o $@ $(filter $(obj-y),$^),rm -f $@; $(HOSTAR) rcs $@)
8989
tools/scripts/Makefile.include+15−15
@@ -131,29 +131,29 @@ QUIET_SUBDIR1 = · 130 unmodified lines
131131
132132 ifneq ($(silent),1)
133133 ifneq ($(V),1)
134− QUIET_CC = @echo ' CC '$@;
135− QUIET_CC_FPIC = @echo ' CC FPIC '$@;
136− QUIET_CLANG = @echo ' CLANG '$@;
137− QUIET_AR = @echo ' AR '$@;
138− QUIET_LINK = @echo ' LINK '$@;
139− QUIET_MKDIR = @echo ' MKDIR '$@;
140− QUIET_GEN = @echo ' GEN '$@;
134+ QUIET_CC = @echo ' CC '$@;
135+ QUIET_CC_FPIC = @echo ' CC FPIC '$@;
136+ QUIET_CLANG = @echo ' CLANG '$@;
137+ QUIET_AR = @echo ' AR '$@;
138+ QUIET_LINK = @echo ' LINK '$@;
139+ QUIET_MKDIR = @echo ' MKDIR '$@;
140+ QUIET_GEN = @echo ' GEN '$@;
141141 QUIET_SUBDIR0 = +@subdir=
142142 QUIET_SUBDIR1 = ;$(NO_SUBDIR) \
143− echo ' SUBDIR '$$subdir; \
143+ echo ' SUBDIR '$$subdir; \
144144 $(MAKE) $(PRINT_DIR) -C $$subdir
145− QUIET_FLEX = @echo ' FLEX '$@;
146− QUIET_BISON = @echo ' BISON '$@;
147− QUIET_GENSKEL = @echo ' GEN-SKEL '$@;
145+ QUIET_FLEX = @echo ' FLEX '$@;
146+ QUIET_BISON = @echo ' BISON '$@;
147+ QUIET_GENSKEL = @echo ' GENSKEL '$@;
148148
149149 descend = \
150− +@echo ' DESCEND '$(1); \
150+ +@echo ' DESCEND '$(1); \
151151 mkdir -p $(OUTPUT)$(1) && \
152152 $(MAKE) $(COMMAND_O) subdir=$(if $(subdir),$(subdir)/$(1),$(1)) $(PRINT_DIR) -C $(1) $(2)
153153
154− QUIET_CLEAN = @printf ' CLEAN %s\n' $1;
155− QUIET_INSTALL = @printf ' INSTALL %s\n' $1;
156− QUIET_UNINST = @printf ' UNINST %s\n' $1;
154+ QUIET_CLEAN = @printf ' CLEAN %s\n' $1;
155+ QUIET_INSTALL = @printf ' INSTALL %s\n' $1;
156+ QUIET_UNINST = @printf ' UNINST %s\n' $1;
157157 endif
158158 endif
159159

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t