examples/rust: Include proper vmlinux.h

The example need to include the correct vmlinux.h header for the current architecture if they aim to build on arches other than x86. Adjust the logic accordingly. Fixes: #247 Signed-off-by: Daniel Müller <[email protected]>
libbpf · Jan 12, 2024 · ffe6e98 · ffe6e98
1 parent ef652aa
commit ffe6e98
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 3 deletions.
diff --git a/examples/rust/profile/build.rs b/examples/rust/profile/build.rs
@@ -1,4 +1,6 @@
 use std::env;
+use std::env::consts::ARCH;
+use std::path::Path;
 use std::path::PathBuf;
 
 use libbpf_cargo::SkeletonBuilder;
@@ -12,6 +14,19 @@ fn main() {
 
     SkeletonBuilder::new()
         .source(SRC)
+        .clang_args(format!(
+            "-I{}",
+            Path::new("../../../vmlinux")
+                .join(match ARCH {
+                    "aarch64" => "arm64",
+                    "loongarch64" => "loongarch",
+                    "powerpc64" => "powerpc",
+                    "riscv64" => "riscv",
+                    "x86_64" => "x86",
+                    _ => ARCH,
+                })
+                .display()
+        ))
         .build_and_generate(out)
         .expect("bpf compilation failed");
     println!("cargo:rerun-if-changed={}", SRC);

diff --git a/examples/rust/profile/src/bpf/vmlinux.h b/examples/rust/profile/src/bpf/vmlinux.h
diff --git a/examples/rust/tracecon/build.rs b/examples/rust/tracecon/build.rs
@@ -1,4 +1,6 @@
 use std::env;
+use std::env::consts::ARCH;
+use std::path::Path;
 use std::path::PathBuf;
 
 use libbpf_cargo::SkeletonBuilder;
@@ -12,6 +14,19 @@ fn main() {
 
     SkeletonBuilder::new()
         .source(SRC)
+        .clang_args(format!(
+            "-I{}",
+            Path::new("../../../vmlinux")
+                .join(match ARCH {
+                    "aarch64" => "arm64",
+                    "loongarch64" => "loongarch",
+                    "powerpc64" => "powerpc",
+                    "riscv64" => "riscv",
+                    "x86_64" => "x86",
+                    _ => ARCH,
+                })
+                .display()
+        ))
         .build_and_generate(&out)
         .expect("bpf compilation failed");
     println!("cargo:rerun-if-changed={}", SRC);

diff --git a/examples/rust/tracecon/src/bpf/vmlinux.h b/examples/rust/tracecon/src/bpf/vmlinux.h
diff --git a/examples/rust/xdp/build.rs b/examples/rust/xdp/build.rs
@@ -1,4 +1,6 @@
 use std::env;
+use std::env::consts::ARCH;
+use std::path::Path;
 use std::path::PathBuf;
 
 use libbpf_cargo::SkeletonBuilder;
@@ -12,6 +14,19 @@ fn main() {
 
     SkeletonBuilder::new()
         .source(SRC)
+        .clang_args(format!(
+            "-I{}",
+            Path::new("../../../vmlinux")
+                .join(match ARCH {
+                    "aarch64" => "arm64",
+                    "loongarch64" => "loongarch",
+                    "powerpc64" => "powerpc",
+                    "riscv64" => "riscv",
+                    "x86_64" => "x86",
+                    _ => ARCH,
+                })
+                .display()
+        ))
         .build_and_generate(out)
         .unwrap();
     println!("cargo:rerun-if-changed={}", SRC);

diff --git a/examples/rust/xdp/src/bpf/vmlinux.h b/examples/rust/xdp/src/bpf/vmlinux.h