aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2021-03-14 15:15:50 +0900
committerMasahiro Yamada <masahiroy@kernel.org>2021-04-25 05:14:01 +0900
commit6e0839fda3f8598b164a7f23f3eec039e2db5fbc (patch)
tree6a1feaeeddf691f200eaaf8058dfc94087156b1d
parentdocs: kbuild: Fix a typo in the file Kconfig.recursion-issue-02 (diff)
downloadlinux-dev-6e0839fda3f8598b164a7f23f3eec039e2db5fbc.tar.xz
linux-dev-6e0839fda3f8598b164a7f23f3eec039e2db5fbc.zip
kbuild: replace sed with $(subst ) or $(patsubst )
For simple text replacement, it is better to use a built-in function instead of sed if possible. You can save one process forking. I do not mean to replace all sed invocations because GNU Make itself does not support regular expression (unless you use guile). I just replaced simple ones. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
-rw-r--r--Documentation/devicetree/bindings/Makefile2
-rw-r--r--Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/Makefile b/Documentation/devicetree/bindings/Makefile
index 780e5618ec0a..ac446c62fbc3 100644
--- a/Documentation/devicetree/bindings/Makefile
+++ b/Documentation/devicetree/bindings/Makefile
@@ -48,7 +48,7 @@ define rule_chkdt
$(call cmd,mk_schema)
endef
-DT_DOCS = $(shell $(find_cmd) | sed -e 's|^$(srctree)/||')
+DT_DOCS = $(patsubst $(srctree)/%,%,$(shell $(find_cmd)))
override DTC_FLAGS := \
-Wno-avoid_unnecessary_addr_size \
diff --git a/Makefile b/Makefile
index 5cb44595418c..cc5b7e39fde4 100644
--- a/Makefile
+++ b/Makefile
@@ -574,7 +574,7 @@ endif
# Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile.
# CC_VERSION_TEXT is referenced from Kconfig (so it needs export),
# and from include/config/auto.conf.cmd to detect the compiler upgrade.
-CC_VERSION_TEXT = $(shell $(CC) --version 2>/dev/null | head -n 1 | sed 's/\#//g')
+CC_VERSION_TEXT = $(subst $(pound),,$(shell $(CC) --version 2>/dev/null | head -n 1))
ifneq ($(findstring clang,$(CC_VERSION_TEXT)),)
ifneq ($(CROSS_COMPILE),)