diff --git a/bpf/aya-bpf-bindings/build.rs b/bpf/aya-bpf-bindings/build.rs
index c3117f3f..1f0c9eb1 100644
--- a/bpf/aya-bpf-bindings/build.rs
+++ b/bpf/aya-bpf-bindings/build.rs
@@ -3,7 +3,7 @@ use std::env;
 fn main() {
     if env::var("CARGO_CFG_BPF_TARGET_ARCH").is_err() {
         let arch = env::var("HOST").unwrap();
-        let arch = arch.splitn(2, '-').next().unwrap();
+        let arch = arch.split_once('-').map_or(&*arch, |x| x.0);
         println!("cargo:rustc-cfg=bpf_target_arch=\"{}\"", arch);
     }
 }
diff --git a/bpf/aya-bpf-cty/build.rs b/bpf/aya-bpf-cty/build.rs
index c3117f3f..1f0c9eb1 100644
--- a/bpf/aya-bpf-cty/build.rs
+++ b/bpf/aya-bpf-cty/build.rs
@@ -3,7 +3,7 @@ use std::env;
 fn main() {
     if env::var("CARGO_CFG_BPF_TARGET_ARCH").is_err() {
         let arch = env::var("HOST").unwrap();
-        let arch = arch.splitn(2, '-').next().unwrap();
+        let arch = arch.split_once('-').map_or(&*arch, |x| x.0);
         println!("cargo:rustc-cfg=bpf_target_arch=\"{}\"", arch);
     }
 }