aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Kbuild.include11
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 1f0d41cc73d1..0f82314621f2 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -7,6 +7,7 @@ quote := "
7squote := ' 7squote := '
8empty := 8empty :=
9space := $(empty) $(empty) 9space := $(empty) $(empty)
10space_escape := _-_SPACE_-_
10 11
11### 12###
12# Name of target with a '.' as filename prefix. foo/bar.o => foo/.bar.o 13# Name of target with a '.' as filename prefix. foo/bar.o => foo/.bar.o
@@ -226,10 +227,10 @@ objectify = $(foreach o,$(1),$(if $(filter /%,$(o)),$(o),$(obj)/$(o)))
226# See Documentation/kbuild/makefiles.txt for more info 227# See Documentation/kbuild/makefiles.txt for more info
227 228
228ifneq ($(KBUILD_NOCMDDEP),1) 229ifneq ($(KBUILD_NOCMDDEP),1)
229# Check if both arguments has same arguments. Result is empty string if equal. 230# Check if both arguments are the same including their order. Result is empty
230# User may override this check using make KBUILD_NOCMDDEP=1 231# string if equal. User may override this check using make KBUILD_NOCMDDEP=1
231arg-check = $(strip $(filter-out $(cmd_$(1)), $(cmd_$@)) \ 232arg-check = $(filter-out $(subst $(space),$(space_escape),$(strip $(cmd_$@))), \
232 $(filter-out $(cmd_$@), $(cmd_$(1))) ) 233 $(subst $(space),$(space_escape),$(strip $(cmd_$1))))
233else 234else
234arg-check = $(if $(strip $(cmd_$@)),,1) 235arg-check = $(if $(strip $(cmd_$@)),,1)
235endif 236endif
@@ -373,8 +374,6 @@ endif
373# 374#
374############################################################################### 375###############################################################################
375# 376#
376space_escape := %%%SPACE%%%
377#
378define config_filename 377define config_filename
379ifneq ($$(CONFIG_$(1)),"") 378ifneq ($$(CONFIG_$(1)),"")
380$(1)_FILENAME := $$(subst \\,\,$$(subst \$$(quote),$$(quote),$$(subst $$(space_escape),\$$(space),$$(patsubst "%",%,$$(subst $$(space),$$(space_escape),$$(CONFIG_$(1))))))) 379$(1)_FILENAME := $$(subst \\,\,$$(subst \$$(quote),$$(quote),$$(subst $$(space_escape),\$$(space),$$(patsubst "%",%,$$(subst $$(space),$$(space_escape),$$(CONFIG_$(1)))))))