Skip to content

Commit

Permalink
Remove duplicate instances of -Z build-std
Browse files Browse the repository at this point in the history
  • Loading branch information
tamird committed Nov 26, 2024
1 parent d264cf5 commit 1174a45
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
4 changes: 3 additions & 1 deletion test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,9 @@ case $OS in
# ${CRATE_NAME} activates ${CRATE_NAME}-common's aya dependency, we end up trying to compile the
# panic handler twice: once from the bpf program, and again from std via aya.
cargo clippy --exclude "${CRATE_NAME}-ebpf" --all-targets --workspace -- --deny warnings
cargo -Z unstable-options -C "${CRATE_NAME}-ebpf" hack clippy --feature-powerset -- --deny warnings
pushd "${CRATE_NAME}-ebpf"
cargo clippy -- --deny warnings
popd

expect <<EOF
set timeout 30 ;# Increase timeout if necessary
Expand Down
4 changes: 0 additions & 4 deletions {{project-name}}-ebpf/.cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# We have this so that one doesn't need to manually pass
# --target=bpfel-unknown-none -Z build-std=core when running cargo
# check/build/doc etc.
#
# NB: this file gets loaded only if you run cargo from this directory, it's
# ignored if you run from the workspace root. See
# https://doc.rust-lang.org/cargo/reference/config.html#hierarchical-structure
Expand Down
2 changes: 0 additions & 2 deletions {{project-name}}/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ fn main() {
let mut cmd = Command::new("cargo");
cmd.args([
"build",
"-Z",
"build-std=core",
"--bins",
"--message-format=json",
"--release",
Expand Down

0 comments on commit 1174a45

Please sign in to comment.