cmake: Fix eBPF include path for all arches

shifty91 · shifty91 · commit b533aaff346e · 2025-02-10T12:37:32.000+01:00
Fix eBPF include path for all arches by using corresponding cmake variable. That works for all multi arch systems. Link: xdp-project/xdp-tools#4 Link: xdp-project/xdp-tools#408 Signed-off-by: Kurt Kanzenbach <kurt@linutronix.de> Reviewed-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -121,9 +121,7 @@ include_directories("${PROJECT_BINARY_DIR}")
 #
 # Add code for compiling XDP eBPF programes.
 #
-execute_process(COMMAND uname -m OUTPUT_VARIABLE BUILD_ARCH ERROR_QUIET)
-string(STRIP "${BUILD_ARCH}" BUILD_ARCH)
-set(ASM_INCLUDE "/usr/include/${BUILD_ARCH}-linux-gnu")
+set(ASM_INCLUDE "/usr/include/${CMAKE_C_LIBRARY_ARCHITECTURE}")
 set(CLANG_FLAGS -S --target=bpf -D __BPF_TRACING__ -Wall -O2 -fno-stack-protector -emit-llvm -g -I ${ASM_INCLUDE})
 set(LLC_FLAGS -march=bpf -filetype=obj)
 

Original file line number	Diff line number	Diff line change
`@@ -121,9 +121,7 @@ include_directories("${PROJECT_BINARY_DIR}")`
`121`	`121`	`#`
`122`	`122`	`# Add code for compiling XDP eBPF programes.`
`123`	`123`	`#`
`124`		`-execute_process(COMMAND uname -m OUTPUT_VARIABLE BUILD_ARCH ERROR_QUIET)`
`125`		`-string(STRIP "${BUILD_ARCH}" BUILD_ARCH)`
`126`		`-set(ASM_INCLUDE "/usr/include/${BUILD_ARCH}-linux-gnu")`
	`124`	`+set(ASM_INCLUDE "/usr/include/${CMAKE_C_LIBRARY_ARCHITECTURE}")`
`127`	`125`	`set(CLANG_FLAGS -S --target=bpf -D __BPF_TRACING__ -Wall -O2 -fno-stack-protector -emit-llvm -g -I ${ASM_INCLUDE})`
`128`	`126`	`set(LLC_FLAGS -march=bpf -filetype=obj)`
`129`	`127`