summaryrefslogtreecommitdiff
path: root/tools/scripts
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2022-02-11 14:14:11 +0900
committerMasahiro Yamada <masahiroy@kernel.org>2022-02-15 12:25:56 +0900
commit5c8166419acf468b5bc3e48f928a040485d3e0c2 (patch)
treeca2951084ba06509599cca6dde48e46cd4368ffb /tools/scripts
parentf67695c9962e5f444549b3437fb8d840ec6222c8 (diff)
downloadlinux-rpi-5c8166419acf468b5bc3e48f928a040485d3e0c2.tar.gz
linux-rpi-5c8166419acf468b5bc3e48f928a040485d3e0c2.tar.bz2
linux-rpi-5c8166419acf468b5bc3e48f928a040485d3e0c2.zip
kbuild: replace $(if A,A,B) with $(or A,B)
$(or ...) is available since GNU Make 3.81, and useful to shorten the code in some places. Covert as follows: $(if A,A,B) --> $(or A,B) This patch also converts: $(if A, A, B) --> $(or A, B) Strictly speaking, the latter is not an equivalent conversion because GNU Make keeps spaces after commas; if A is not empty, $(if A, A, B) expands to " A", while $(or A, B) expands to "A". Anyway, preceding spaces are not significant in the code hunks I touched. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
Diffstat (limited to 'tools/scripts')
-rw-r--r--tools/scripts/utilities.mak2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/scripts/utilities.mak b/tools/scripts/utilities.mak
index c16ce833079c..172e47273b5d 100644
--- a/tools/scripts/utilities.mak
+++ b/tools/scripts/utilities.mak
@@ -175,5 +175,5 @@ _ge-abspath = $(if $(is-executable),$(1))
define get-executable-or-default
$(if $($(1)),$(call _ge_attempt,$($(1)),$(1)),$(call _ge_attempt,$(2)))
endef
-_ge_attempt = $(if $(get-executable),$(get-executable),$(call _gea_err,$(2)))
+_ge_attempt = $(or $(get-executable),$(call _gea_err,$(2)))
_gea_err = $(if $(1),$(error Please set '$(1)' appropriately))