Skip to content
Snippets Groups Projects
Commit 18e39913 authored by David Gibson's avatar David Gibson Committed by Linus Torvalds
Browse files

[PATCH] Fix spurious error on TAGS target when missing defconfig


Not all architectures have a file named 'defconfig' (e.g.  powerpc).
However the make TAGS and make tags targets search such files for tags,
causing an error message when they don't exist.  This patch addresses the
problem by instructing xargs not to run the tags program if there are no
matching files.

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 585b7747
No related merge requests found
...@@ -1321,7 +1321,7 @@ define xtags ...@@ -1321,7 +1321,7 @@ define xtags
--langdef=kconfig \ --langdef=kconfig \
--language-force=kconfig \ --language-force=kconfig \
--regex-kconfig='/^[[:blank:]]*config[[:blank:]]+([[:alnum:]_]+)/\1/'; \ --regex-kconfig='/^[[:blank:]]*config[[:blank:]]+([[:alnum:]_]+)/\1/'; \
$(all-defconfigs) | xargs $1 -a \ $(all-defconfigs) | xargs -r $1 -a \
--langdef=dotconfig \ --langdef=dotconfig \
--language-force=dotconfig \ --language-force=dotconfig \
--regex-dotconfig='/^#?[[:blank:]]*(CONFIG_[[:alnum:]_]+)/\1/'; \ --regex-dotconfig='/^#?[[:blank:]]*(CONFIG_[[:alnum:]_]+)/\1/'; \
...@@ -1329,7 +1329,7 @@ define xtags ...@@ -1329,7 +1329,7 @@ define xtags
$(all-sources) | xargs $1 -a; \ $(all-sources) | xargs $1 -a; \
$(all-kconfigs) | xargs $1 -a \ $(all-kconfigs) | xargs $1 -a \
--regex='/^[ \t]*config[ \t]+\([a-zA-Z0-9_]+\)/\1/'; \ --regex='/^[ \t]*config[ \t]+\([a-zA-Z0-9_]+\)/\1/'; \
$(all-defconfigs) | xargs $1 -a \ $(all-defconfigs) | xargs -r $1 -a \
--regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \ --regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \
else \ else \
$(all-sources) | xargs $1 -a; \ $(all-sources) | xargs $1 -a; \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment