Commit e5d28910 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: remove trailing semicolon from cmd_* passed to if_changed_rule 



With the change of rule_cc_o_c / rule_as_o_S in the last commit, each
command is executed in a separate subshell. Rip off unneeded semicolons.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 3a2429e1

scripts/Kbuild.include

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ if_changed_dep = $(if $(strip $(any-prereq) $(arg-check)),$(cmd_and_fixdep),@:) 
cmd_and_fixdep =                                                             \

	$(cmd);                                                              \

	scripts/basic/fixdep $(depfile) $@ '$(make-cmd)' > $(dot-target).cmd;\

	rm -f $(depfile);

	rm -f $(depfile)



# Usage: $(call if_changed_rule,foo)

# Will check if $(cmd_foo) or any of the prerequisites changed,

scripts/Makefile.build

+8 −8
Original line number Diff line number Diff line
@@ -75,14 +75,14 @@ __build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(extra-y)) \ 
# Linus' kernel sanity checking tool

ifeq ($(KBUILD_CHECKSRC),1)

  quiet_cmd_checksrc       = CHECK   $<

        cmd_checksrc       = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;

        cmd_checksrc       = $(CHECK) $(CHECKFLAGS) $(c_flags) $<

else ifeq ($(KBUILD_CHECKSRC),2)

  quiet_cmd_force_checksrc = CHECK   $<

        cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;

        cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $<

endif



ifneq ($(KBUILD_ENABLE_EXTRA_GCC_CHECKS),)

  cmd_checkdoc = $(srctree)/scripts/kernel-doc -none $< ;

  cmd_checkdoc = $(srctree)/scripts/kernel-doc -none $<

endif



# Do section mismatch analysis for each module/built-in.a
@@ -178,7 +178,7 @@ cmd_modversions_c = \ 
			-T $(@D)/.tmp_$(@F:.o=.ver);				\

		mv -f $(@D)/.tmp_$(@F) $@;					\

		rm -f $(@D)/.tmp_$(@F:.o=.ver);					\

	fi;

	fi

endif



ifdef CONFIG_FTRACE_MCOUNT_RECORD
@@ -211,7 +211,7 @@ cmd_record_mcount = \ 
	if [ "$(findstring $(CC_FLAGS_FTRACE),$(_c_flags))" =	\

	     "$(CC_FLAGS_FTRACE)" ]; then			\

		$(sub_cmd_record_mcount)			\

	fi;

	fi

endif # CC_USING_RECORD_MCOUNT

endif # CONFIG_FTRACE_MCOUNT_RECORD
@@ -241,7 +241,7 @@ endif 
# 'OBJECT_FILES_NON_STANDARD_foo.o := 'n': override directory skip for a file

cmd_objtool = $(if $(patsubst y%,, \

	$(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n), \

	$(__objtool_obj) $(objtool_args) $@;)

	$(__objtool_obj) $(objtool_args) $@)

objtool_obj = $(if $(patsubst y%,, \

	$(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n), \

	$(__objtool_obj))
@@ -256,7 +256,7 @@ objtool_dep = $(objtool_obj) \ 


ifdef CONFIG_TRIM_UNUSED_KSYMS

cmd_gen_ksymdeps = \

	$(CONFIG_SHELL) $(srctree)/scripts/gen_ksymdeps.sh $@ >> $(dot-target).cmd;

	$(CONFIG_SHELL) $(srctree)/scripts/gen_ksymdeps.sh $@ >> $(dot-target).cmd

endif



define rule_cc_o_c
@@ -372,7 +372,7 @@ cmd_modversions_S = \ 
			-T $(@D)/.tmp_$(@F:.o=.ver);				\

		mv -f $(@D)/.tmp_$(@F) $@;					\

		rm -f $(@D)/.tmp_$(@F:.o=.ver);					\

	fi;

	fi

endif

endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE