replace ./cargo with cargo in sbf/bpf build scripts (#29371)

This commit is contained in:
kirill lykov 2022-12-22 20:17:11 +01:00 committed by GitHub
parent d33129193f
commit 49f4e2ae05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions

View File

@ -11,9 +11,9 @@ done
set -ex
if [[ ! -f "$here"/sdk/bpf/syscalls.txt ]]; then
"$here"/cargo build --manifest-path "$here"/programs/bpf_loader/gen-syscall-list/Cargo.toml
cargo build --manifest-path "$here"/programs/bpf_loader/gen-syscall-list/Cargo.toml
fi
if [[ ! -f "$here"/target/debug/cargo-build-sbf ]]; then
"$here"/cargo build --manifest-path "$here"/sdk/cargo-build-sbf/Cargo.toml
cargo build --manifest-path "$here"/sdk/cargo-build-sbf/Cargo.toml
fi
exec "$here"/cargo run --manifest-path "$here"/sdk/cargo-build-bpf/Cargo.toml -- $maybe_bpf_sdk "$@"
exec cargo run --manifest-path "$here"/sdk/cargo-build-bpf/Cargo.toml -- $maybe_bpf_sdk "$@"

View File

@ -11,6 +11,6 @@ done
set -ex
if [[ ! -f "$here"/sdk/sbf/syscalls.txt ]]; then
"$here"/cargo build --manifest-path "$here"/programs/bpf_loader/gen-syscall-list/Cargo.toml
cargo build --manifest-path "$here"/programs/bpf_loader/gen-syscall-list/Cargo.toml
fi
exec "$here"/cargo run --manifest-path "$here"/sdk/cargo-build-sbf/Cargo.toml -- $maybe_sbf_sdk "$@"
exec cargo run --manifest-path "$here"/sdk/cargo-build-sbf/Cargo.toml -- $maybe_sbf_sdk "$@"

View File

@ -12,9 +12,9 @@ done
export CARGO_BUILD_BPF="$here"/cargo-build-bpf
set -x
if [[ ! -f "$here"/target/debug/cargo-build-sbf ]]; then
"$here"/cargo build --manifest-path "$here"/sdk/cargo-build-sbf/Cargo.toml
cargo build --manifest-path "$here"/sdk/cargo-build-sbf/Cargo.toml
fi
if [[ ! -f "$here"/target/debug/cargo-test-sbf ]]; then
"$here"/cargo build --manifest-path "$here"/sdk/cargo-test-sbf/Cargo.toml
cargo build --manifest-path "$here"/sdk/cargo-test-sbf/Cargo.toml
fi
exec "$here"/cargo run --manifest-path "$here"/sdk/cargo-test-bpf/Cargo.toml -- $maybe_bpf_sdk "$@"
exec cargo run --manifest-path "$here"/sdk/cargo-test-bpf/Cargo.toml -- $maybe_bpf_sdk "$@"

View File

@ -11,4 +11,4 @@ done
export CARGO_BUILD_SBF="$here"/cargo-build-sbf
set -x
exec "$here"/cargo run --manifest-path "$here"/sdk/cargo-test-sbf/Cargo.toml -- $maybe_sbf_sdk "$@"
exec cargo run --manifest-path "$here"/sdk/cargo-test-sbf/Cargo.toml -- $maybe_sbf_sdk "$@"