ctf: do not build dwarf2ctf nor attempt to use it if !CONFIG_DTRACE

We were already not using it for the CONFIG_DT_DISABLE_CTF case, but not
suppressing its build nor noting the !CONFIG_DTRACE case properly.

Signed-off-by: Nick Alcock <nick.alcock@oracle.com>

diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 9a705f47efe4cc80ce68fac81655a58d9a94268e..39d05fbb766b0d76cc464752686475ce6875d06b 100644 (file)
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -122,6 +122,7 @@ targets += $(modules:.ko=.mod.o)
 # Step 6), generate CTF for the entire kernel, or for the module alone if this
 # is a build of an external module.
 
+ifdef CONFIG_DTRACE
 ifndef CONFIG_DT_DISABLE_CTF
 
 # This is quite tricky.  If called for non-external-modules, dwarf2ctf needs to
@@ -215,6 +216,14 @@ module-ctfs-builtin =
 module-ctf-flags =
 cmd-touch-ctf = @:
 
+endif
+else
+
+module-ctfs-modular-prereq =
+module-ctfs-builtin =
+module-ctf-flags =
+cmd-touch-ctf = @:
+
 endif
 
 # Step 7), final link of the modules

diff --git a/scripts/dwarf2ctf/Makefile b/scripts/dwarf2ctf/Makefile
index 751c6d08249523d62cf4c313c8642b703a8b8d41..ad89de7679ad04afbc4285d07fe9b12da9acb8d4 100644 (file)
--- a/scripts/dwarf2ctf/Makefile
+++ b/scripts/dwarf2ctf/Makefile
@@ -1,5 +1,9 @@
+ifdef CONFIG_DTRACE
+ifndef CONFIG_DT_DISABLE_CTF
 hostprogs-y    := dwarf2ctf
 always         := $(hostprogs-y)
 
 HOSTCFLAGS_dwarf2ctf.o := $(shell pkg-config --cflags glib-2.0)
 HOSTLOADLIBES_dwarf2ctf := -ldtrace-ctf -lelf -ldw $(shell pkg-config --libs glib-2.0) -lz
+endif
+endif