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

anza-xyz · Dec 22, 2022 · 49f4e2a · 49f4e2a
1 parent d331291
commit 49f4e2a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/cargo-build-bpf b/cargo-build-bpf
@@ -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 "$@"
diff --git a/cargo-build-sbf b/cargo-build-sbf
@@ -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 "$@"
diff --git a/cargo-test-bpf b/cargo-test-bpf
@@ -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 "$@"
diff --git a/cargo-test-sbf b/cargo-test-sbf
@@ -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 "$@"