diff options
author | Masahiro Yamada <masahiroy@kernel.org> | 2022-02-11 08:14:11 +0300 |
---|---|---|
committer | Masahiro Yamada <masahiroy@kernel.org> | 2022-02-15 06:25:56 +0300 |
commit | 5c8166419acf468b5bc3e48f928a040485d3e0c2 (patch) | |
tree | ca2951084ba06509599cca6dde48e46cd4368ffb /tools/objtool | |
parent | f67695c9962e5f444549b3437fb8d840ec6222c8 (diff) | |
download | linux-5c8166419acf468b5bc3e48f928a040485d3e0c2.tar.xz |
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/objtool')
-rw-r--r-- | tools/objtool/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile index 92ce4fce7bc7..0dbd397f319d 100644 --- a/tools/objtool/Makefile +++ b/tools/objtool/Makefile @@ -13,7 +13,7 @@ srctree := $(patsubst %/,%,$(dir $(srctree))) endif SUBCMD_SRCDIR = $(srctree)/tools/lib/subcmd/ -LIBSUBCMD_OUTPUT = $(if $(OUTPUT),$(OUTPUT),$(CURDIR)/) +LIBSUBCMD_OUTPUT = $(or $(OUTPUT),$(CURDIR)/) LIBSUBCMD = $(LIBSUBCMD_OUTPUT)libsubcmd.a OBJTOOL := $(OUTPUT)objtool |