Skip to contentSkip to conversation

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

PATCH In review Masahiro Yamada 2 participants 2 messages May 23, 2022 – May 24, 2022 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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)").

---

 scripts/Makefile.modpost | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/Makefile.modpost +1 -1
index 7c3899182a4a..911606496341 100644
@@ -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
Signature · 1 line
2.32.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Masahiro Yamada

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

Thanks for the patch!

Quoted 21 lines

---

 scripts/Makefile.modpost | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/Makefile.modpost +1 -2
index 7c3899182a4a..911606496341 100644
@@ -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

Signature · 2 lines
Thanks,
~Nick Desaulniers