Only remove RUSTUP_TOOLCHAIN env var in xtask build-ebpf

xtask/src/build_ebpf.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, env, path::PathBuf, process::Command};
+use std::{path::PathBuf, process::Command};
 
 use clap::Parser;
 
@@ -54,16 +54,12 @@ pub fn build_ebpf(opts: Options) -> Result<(), anyhow::Error> {
     }
 
     // Command::new creates a child process which inherits all env variables. This means env
-    // vars set by the cargo xtask command are also inherited. All env vars related to the
+    // vars set by the cargo xtask command are also inherited. RUSTUP_TOOLCHAIN is removed
-    // cargo xtask invocation are removed.
+    // so the rust-toolchain.toml file in the -ebpf folder is honored.
-    let filtered_env: HashMap<String, String> = env::vars()
-        .filter(|&(ref k, _)| !k.starts_with("CARGO") && !k.starts_with("RUST"))
-        .collect();
 
     let status = Command::new("cargo")
         .current_dir(dir)
-        .env_clear()
+        .env_remove("RUSTUP_TOOLCHAIN")
-        .envs(&filtered_env)
         .args(&args)
         .status()
         .expect("failed to build bpf program");