From a322e0e141dcba57b2b19e545cb59e107ae93d07 Mon Sep 17 00:00:00 2001 From: Kris Van Hees Date: Thu, 15 May 2014 17:40:12 -0400 Subject: [PATCH] dtrace: ensure that building outside src tree works The Makefile.build and Makefile.modpost uses of dtrace_sdt.sh were not safe for out-of-srctree building because they expected to be able to call the scripts with a relative path. This has been corrected. The problem was introduced with the SDT-in-modules support. Orabug: 18691341 Signed-off-by: Kris Van Hees Acked-by: Chuck Anderson Acked-by: Jerry Snitselaar --- scripts/Makefile.build | 2 +- scripts/Makefile.modpost | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 81ec4f729d5c..97a800635763 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -385,7 +385,7 @@ ifdef CONFIG_DTRACE # We need secondary expansion for the %.sdtstub.S creation rule .SECONDEXPANSION: -sdtgen = scripts/dtrace_sdt.sh +sdtgen = $(srctree)/scripts/dtrace_sdt.sh quiet_cmd_sdtstub = SDTSTB $@ cmd_sdtstub = $(sdtgen) sdtstub $@ \ diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 4cf971c3cc70..cec7ba293f2a 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -116,7 +116,7 @@ quiet_cmd_cc_o_c = CC $@ ifdef CONFIG_DTRACE -sdtgen = scripts/dtrace_sdt.sh +sdtgen = $(srctree)/scripts/dtrace_sdt.sh quiet_cmd_sdtinfo = SDTINF $@ cmd_sdtinfo = $(sdtgen) sdtinfo $@ $< kmod -- 2.50.1