Skip to content

Commit

Permalink
Remove rust-toolchain
Browse files Browse the repository at this point in the history
Doesn't make much sense in a workspace.
  • Loading branch information
tamird authored and vadorovsky committed Dec 2, 2024
1 parent 59c882c commit 77cbc8b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
3 changes: 0 additions & 3 deletions {{project-name}}-ebpf/rust-toolchain.toml

This file was deleted.

5 changes: 3 additions & 2 deletions {{project-name}}/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ fn main() {

let mut cmd = Command::new("cargo");
cmd.args([
"+nightly",
"build",
"-Z",
"build-std=core",
Expand All @@ -71,8 +72,8 @@ fn main() {

cmd.env("CARGO_CFG_BPF_TARGET_ARCH", arch);

// Workaround to make sure that the rust-toolchain.toml is respected.
for key in ["RUSTUP_TOOLCHAIN", "RUSTC", "RUSTC_WORKSPACE_WRAPPER"] {
// Workaround to make sure that the correct toolchain is used.
for key in ["RUSTC", "RUSTC_WORKSPACE_WRAPPER"] {
cmd.env_remove(key);
}
cmd.current_dir(ebpf_dir);
Expand Down

0 comments on commit 77cbc8b

Please sign in to comment.