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.
Unified · Split
| @@ -51,39 +51,39 @@ subdir-obj-y := · 50 unmodified lines | |||
| 51 | build-file := $(dir)/Build | 51 | build-file := $(dir)/Build |
| 52 | -include $(build-file) | 52 | -include $(build-file) |
| 53 | 53 | ||
| 54 | quiet_cmd_flex = FLEX $@ | 54 | quiet_cmd_flex = FLEX $@ |
| 55 | quiet_cmd_bison = BISON $@ | 55 | quiet_cmd_bison = BISON $@ |
| 56 | 56 | ||
| 57 | # Create directory unless it exists | 57 | # Create directory unless it exists |
| 58 | quiet_cmd_mkdir = MKDIR $(dir $@) | 58 | quiet_cmd_mkdir = MKDIR $(dir $@) |
| 59 | cmd_mkdir = mkdir -p $(dir $@) | 59 | cmd_mkdir = mkdir -p $(dir $@) |
| 60 | rule_mkdir = $(if $(wildcard $(dir $@)),,@$(call echo-cmd,mkdir) $(cmd_mkdir)) | 60 | rule_mkdir = $(if $(wildcard $(dir $@)),,@$(call echo-cmd,mkdir) $(cmd_mkdir)) |
| 61 | 61 | ||
| 62 | # Compile command | 62 | # Compile command |
| 63 | quiet_cmd_cc_o_c = CC $@ | 63 | quiet_cmd_cc_o_c = CC $@ |
| 64 | cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $< | 64 | cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $< |
| 65 | 65 | ||
| 66 | quiet_cmd_host_cc_o_c = HOSTCC $@ | 66 | quiet_cmd_host_cc_o_c = HOSTCC $@ |
| 67 | cmd_host_cc_o_c = $(HOSTCC) $(host_c_flags) -c -o $@ $< | 67 | cmd_host_cc_o_c = $(HOSTCC) $(host_c_flags) -c -o $@ $< |
| 68 | 68 | ||
| 69 | quiet_cmd_cxx_o_c = CXX $@ | 69 | quiet_cmd_cxx_o_c = CXX $@ |
| 70 | cmd_cxx_o_c = $(CXX) $(cxx_flags) -c -o $@ $< | 70 | cmd_cxx_o_c = $(CXX) $(cxx_flags) -c -o $@ $< |
| 71 | 71 | ||
| 72 | quiet_cmd_cpp_i_c = CPP $@ | 72 | quiet_cmd_cpp_i_c = CPP $@ |
| 73 | cmd_cpp_i_c = $(CC) $(c_flags) -E -o $@ $< | 73 | cmd_cpp_i_c = $(CC) $(c_flags) -E -o $@ $< |
| 74 | 74 | ||
| 75 | quiet_cmd_cc_s_c = AS $@ | 75 | quiet_cmd_cc_s_c = AS $@ |
| 76 | cmd_cc_s_c = $(CC) $(c_flags) -S -o $@ $< | 76 | cmd_cc_s_c = $(CC) $(c_flags) -S -o $@ $< |
| 77 | 77 | ||
| 78 | quiet_cmd_gen = GEN $@ | 78 | quiet_cmd_gen = GEN $@ |
| 79 | 79 | ||
| 80 | # Link agregate command | 80 | # Link agregate command |
| 81 | # If there's nothing to link, create empty $@ object. | 81 | # If there's nothing to link, create empty $@ object. |
| 82 | quiet_cmd_ld_multi = LD $@ | 82 | quiet_cmd_ld_multi = LD $@ |
| 83 | cmd_ld_multi = $(if $(strip $(obj-y)),\ | 83 | cmd_ld_multi = $(if $(strip $(obj-y)),\ |
| 84 | $(LD) -r -o $@ $(filter $(obj-y),$^),rm -f $@; $(AR) rcs $@) | 84 | $(LD) -r -o $@ $(filter $(obj-y),$^),rm -f $@; $(AR) rcs $@) |
| 85 | 85 | ||
| 86 | quiet_cmd_host_ld_multi = HOSTLD $@ | 86 | quiet_cmd_host_ld_multi = HOSTLD $@ |
| 87 | cmd_host_ld_multi = $(if $(strip $(obj-y)),\ | 87 | cmd_host_ld_multi = $(if $(strip $(obj-y)),\ |
| 88 | $(HOSTLD) -r -o $@ $(filter $(obj-y),$^),rm -f $@; $(HOSTAR) rcs $@) | 88 | $(HOSTLD) -r -o $@ $(filter $(obj-y),$^),rm -f $@; $(HOSTAR) rcs $@) |
| 89 | 89 | ||
| @@ -131,29 +131,29 @@ QUIET_SUBDIR1 = · 130 unmodified lines | |||
| 131 | 131 | ||
| 132 | ifneq ($(silent),1) | 132 | ifneq ($(silent),1) |
| 133 | ifneq ($(V),1) | 133 | ifneq ($(V),1) |
| 134 | QUIET_CC = @echo ' CC '$@; | 134 | QUIET_CC = @echo ' CC '$@; |
| 135 | QUIET_CC_FPIC = @echo ' CC FPIC '$@; | 135 | QUIET_CC_FPIC = @echo ' CC FPIC '$@; |
| 136 | QUIET_CLANG = @echo ' CLANG '$@; | 136 | QUIET_CLANG = @echo ' CLANG '$@; |
| 137 | QUIET_AR = @echo ' AR '$@; | 137 | QUIET_AR = @echo ' AR '$@; |
| 138 | QUIET_LINK = @echo ' LINK '$@; | 138 | QUIET_LINK = @echo ' LINK '$@; |
| 139 | QUIET_MKDIR = @echo ' MKDIR '$@; | 139 | QUIET_MKDIR = @echo ' MKDIR '$@; |
| 140 | QUIET_GEN = @echo ' GEN '$@; | 140 | QUIET_GEN = @echo ' GEN '$@; |
| 141 | QUIET_SUBDIR0 = +@subdir= | 141 | QUIET_SUBDIR0 = +@subdir= |
| 142 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) \ | 142 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) \ |
| 143 | echo ' SUBDIR '$$subdir; \ | 143 | echo ' SUBDIR '$$subdir; \ |
| 144 | $(MAKE) $(PRINT_DIR) -C $$subdir | 144 | $(MAKE) $(PRINT_DIR) -C $$subdir |
| 145 | QUIET_FLEX = @echo ' FLEX '$@; | 145 | QUIET_FLEX = @echo ' FLEX '$@; |
| 146 | QUIET_BISON = @echo ' BISON '$@; | 146 | QUIET_BISON = @echo ' BISON '$@; |
| 147 | QUIET_GENSKEL = @echo ' GEN-SKEL '$@; | 147 | QUIET_GENSKEL = @echo ' GENSKEL '$@; |
| 148 | 148 | ||
| 149 | descend = \ | 149 | descend = \ |
| 150 | +@echo ' DESCEND '$(1); \ | 150 | +@echo ' DESCEND '$(1); \ |
| 151 | mkdir -p $(OUTPUT)$(1) && \ | 151 | mkdir -p $(OUTPUT)$(1) && \ |
| 152 | $(MAKE) $(COMMAND_O) subdir=$(if $(subdir),$(subdir)/$(1),$(1)) $(PRINT_DIR) -C $(1) $(2) | 152 | $(MAKE) $(COMMAND_O) subdir=$(if $(subdir),$(subdir)/$(1),$(1)) $(PRINT_DIR) -C $(1) $(2) |
| 153 | 153 | ||
| 154 | QUIET_CLEAN = @printf ' CLEAN %s\n' $1; | 154 | QUIET_CLEAN = @printf ' CLEAN %s\n' $1; |
| 155 | QUIET_INSTALL = @printf ' INSTALL %s\n' $1; | 155 | QUIET_INSTALL = @printf ' INSTALL %s\n' $1; |
| 156 | QUIET_UNINST = @printf ' UNINST %s\n' $1; | 156 | QUIET_UNINST = @printf ' UNINST %s\n' $1; |
| 157 | endif | 157 | endif |
| 158 | endif | 158 | endif |
| 159 | 159 | ||