Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'kbuild-fixes-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada:
- Fix short log indentation for tools builds
- Fix dummy-tools to adjust to the latest stackprotector check
* tag 'kbuild-fixes-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kbuild: dummy-tools: adjust to stricter stackprotector check
scripts/jobserver-exec: Fix a typo ("envirnoment")
tools build: Fix quiet cmd indentation
+32
-28
+5
-1
scripts/dummy-tools/gcc
+5
-1
scripts/dummy-tools/gcc
+1
-1
scripts/jobserver-exec
+1
-1
scripts/jobserver-exec
+11
-11
tools/build/Makefile.build
+11
-11
tools/build/Makefile.build
···
51
51
build-file := $(dir)/Build
52
52
-include $(build-file)
53
53
54
-
quiet_cmd_flex = FLEX $@
55
-
quiet_cmd_bison = BISON $@
54
+
quiet_cmd_flex = FLEX $@
55
+
quiet_cmd_bison = BISON $@
56
56
57
57
# Create directory unless it exists
58
-
quiet_cmd_mkdir = MKDIR $(dir $@)
58
+
quiet_cmd_mkdir = MKDIR $(dir $@)
59
59
cmd_mkdir = mkdir -p $(dir $@)
60
60
rule_mkdir = $(if $(wildcard $(dir $@)),,@$(call echo-cmd,mkdir) $(cmd_mkdir))
61
61
62
62
# Compile command
63
-
quiet_cmd_cc_o_c = CC $@
63
+
quiet_cmd_cc_o_c = CC $@
64
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
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
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
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
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
80
# Link agregate command
81
81
# If there's nothing to link, create empty $@ object.
82
-
quiet_cmd_ld_multi = LD $@
82
+
quiet_cmd_ld_multi = LD $@
83
83
cmd_ld_multi = $(if $(strip $(obj-y)),\
84
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
87
cmd_host_ld_multi = $(if $(strip $(obj-y)),\
88
88
$(HOSTLD) -r -o $@ $(filter $(obj-y),$^),rm -f $@; $(HOSTAR) rcs $@)
89
89
+15
-15
tools/scripts/Makefile.include
+15
-15
tools/scripts/Makefile.include
···
131
131
132
132
ifneq ($(silent),1)
133
133
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 '$@;
141
141
QUIET_SUBDIR0 = +@subdir=
142
142
QUIET_SUBDIR1 = ;$(NO_SUBDIR) \
143
-
echo ' SUBDIR '$$subdir; \
143
+
echo ' SUBDIR '$$subdir; \
144
144
$(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 '$@;
148
148
149
149
descend = \
150
-
+@echo ' DESCEND '$(1); \
150
+
+@echo ' DESCEND '$(1); \
151
151
mkdir -p $(OUTPUT)$(1) && \
152
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;
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;
157
157
endif
158
158
endif
159
159