2022-05-23 18:46:45

by Masahiro Yamada

Subject: [PATCH] kbuild: replace $(if A,A,B) with $(or A,B) in scripts/Makefile.modpost

Similar cleanup to commit 5c8166419acf ("kbuild: replace $(if A,A,B)
with $(or A,B)").

Signed-off-by: Masahiro Yamada <[email protected]>
---

scripts/Makefile.modpost | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 7c3899182a4a..911606496341 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -84,7 +84,7 @@ obj := $(KBUILD_EXTMOD)
src := $(obj)

# Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS
-include $(if $(wildcard $(src)/Kbuild), $(src)/Kbuild, $(src)/Makefile)
+include $(or $(wildcard $(src)/Kbuild), $(src)/Makefile)

# modpost option for external modules
MODPOST += -e
--
2.32.0

2022-05-26 09:36:26

by Nick Desaulniers

Subject: Re: [PATCH] kbuild: replace $(if A,A,B) with $(or A,B) in scripts/Makefile.modpost

On Mon, May 23, 2022 at 11:16 AM Masahiro Yamada <[email protected]> wrote:
>
> Similar cleanup to commit 5c8166419acf ("kbuild: replace $(if A,A,B)
> with $(or A,B)").
>
> Signed-off-by: Masahiro Yamada <[email protected]>

Thanks for the patch!
Reviewed-by: Nick Desaulniers <[email protected]>

> ---
>
> scripts/Makefile.modpost | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
> index 7c3899182a4a..911606496341 100644
> --- a/scripts/Makefile.modpost
> +++ b/scripts/Makefile.modpost
> @@ -84,7 +84,7 @@ obj := $(KBUILD_EXTMOD)
> src := $(obj)
>
> # Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS
> -include $(if $(wildcard $(src)/Kbuild), $(src)/Kbuild, $(src)/Makefile)
> +include $(or $(wildcard $(src)/Kbuild), $(src)/Makefile)
>
> # modpost option for external modules
> MODPOST += -e
> --
> 2.32.0
>


--
Thanks,
~Nick Desaulniers