diff mbox series

[RESEND] bpf: fix bad include in libbpf when srctree is set

Message ID 20180101123654.16014-1-alexander@alemayhu.com
State Changes Requested, archived
Delegated to: BPF Maintainers
Headers show
Series [RESEND] bpf: fix bad include in libbpf when srctree is set | expand

Commit Message

Alexander Alemayhu Jan. 1, 2018, 12:36 p.m. UTC
The relative path can be wrong and prevents the build.

	Makefile:57: ../../scripts/Makefile.include: No such file or directory
	make: *** No rule to make target '../../scripts/Makefile.include'.  Stop.

Signed-off-by: Alexander Alemayhu <alexander@alemayhu.com>
---
 tools/lib/bpf/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Daniel Borkmann Jan. 4, 2018, 10:47 p.m. UTC | #1
On 01/01/2018 01:36 PM, Alexander Alemayhu wrote:
> The relative path can be wrong and prevents the build.

You mean if you move the files from tools/lib/bpf/ to a different
location, and then specify srctree var pointing to a kernel tree?

I think this would also break various other assumptions inside the
tools/lib/bpf/Makefile, e.g. the uapi header checks also depending
on relative paths.

> 	Makefile:57: ../../scripts/Makefile.include: No such file or directory
> 	make: *** No rule to make target '../../scripts/Makefile.include'.  Stop.
> 
> Signed-off-by: Alexander Alemayhu <alexander@alemayhu.com>
> ---
>  tools/lib/bpf/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
> index 4555304dc18e..0068829a56db 100644
> --- a/tools/lib/bpf/Makefile
> +++ b/tools/lib/bpf/Makefile
> @@ -54,7 +54,7 @@ man_dir_SQ = '$(subst ','\'',$(man_dir))'
>  export man_dir man_dir_SQ INSTALL
>  export DESTDIR DESTDIR_SQ
>  
> -include ../../scripts/Makefile.include
> +include $(srctree)/tools/scripts/Makefile.include
>  
>  # copy a bit from Linux kbuild
>  
>
diff mbox series

Patch

diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
index 4555304dc18e..0068829a56db 100644
--- a/tools/lib/bpf/Makefile
+++ b/tools/lib/bpf/Makefile
@@ -54,7 +54,7 @@  man_dir_SQ = '$(subst ','\'',$(man_dir))'
 export man_dir man_dir_SQ INSTALL
 export DESTDIR DESTDIR_SQ
 
-include ../../scripts/Makefile.include
+include $(srctree)/tools/scripts/Makefile.include
 
 # copy a bit from Linux kbuild