From: Masahiro Yamada <masahiroy@kernel.org>
Date: Mon, 1 Jun 2020 05:57:23 +0000 (+0900)
Subject: modpost: move -d option in scripts/Makefile.modpost
X-Git-Tag: v5.8-rc1~111^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=859c926aea29353bced3a456c2f73753040b437e;p=thirdparty%2Fkernel%2Flinux.git

modpost: move -d option in scripts/Makefile.modpost

Collect options for modules into a single place.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 4938a6f368c0e..3651cbf6ad49d 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -62,9 +62,6 @@ __modpost: vmlinux.symvers
 
 else
 
-MODPOST += \
-	$(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS))
-
 ifeq ($(KBUILD_EXTMOD),)
 
 input-symdump := vmlinux.symvers
@@ -91,6 +88,7 @@ endif
 # modpost options for modules (both in-kernel and external)
 MODPOST += \
 	$(addprefix -i ,$(wildcard $(input-symdump))) \
+	$(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS)) \
 	$(if $(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS)$(KBUILD_NSDEPS),-N)
 
 # 'make -i -k' ignores compile errors, and builds as many modules as possible.