Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Commit b859964

Browse files
authored
BPF script nits (#6405)
1 parent 26d31b6 commit b859964

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

programs/bpf/Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

programs/bpf/rust/do.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ perform_action() {
2828
set -e
2929
case "$1" in
3030
build)
31-
bash -x "$sdkDir"/bpf/rust/build.sh "$2"
31+
"$sdkDir"/bpf/rust/build.sh "$2"
3232

3333
so_path="$targetDir/$profile/"
3434
so_name="solana_bpf_rust_${3%/}"
3535
if [ -f "$so_path/${so_name}.so" ]; then
3636
cp "$so_path/${so_name}.so" "$so_path/${so_name}_debug.so"
37-
"$sdkDir"/bpf/dependencies/llvm-native/bin/llvm-objcopy --strip-all "$so_path/${so_name}.so" "$so_path/$so_name.so"
37+
"$sdkDir/bpf/dependencies/llvm-native/bin/llvm-objcopy" --strip-all "$so_path/${so_name}.so" "$so_path/$so_name.so"
3838
fi
3939
;;
4040
clean)
@@ -67,11 +67,11 @@ perform_action() {
6767
# - rustfilt
6868
(
6969
pwd
70-
./do.sh build "$3"
70+
"$0" build "$3"
7171

7272
cd "$3"
73-
so="$targetDir"/"$profile"/solana_bpf_rust_"${3%/}"_debug.so
74-
dump="$targetDir"/"${3%/}"-dump
73+
so="$targetDir/$profile/solana_bpf_rust_${3%/}_debug.so"
74+
dump="$targetDir/${3%/}-dump"
7575

7676
if [ -f "$so" ]; then
7777
ls \
@@ -82,7 +82,7 @@ perform_action() {
8282
-aW \
8383
"$so" \
8484
>>"${dump}-mangled.txt"
85-
../"$sdkDir"/bpf/dependencies/llvm-native/bin/llvm-objdump \
85+
../"$sdkDir/bpf/dependencies/llvm-native/bin/llvm-objdump" \
8686
-print-imm-hex \
8787
--source \
8888
--disassemble \

0 commit comments

Comments
 (0)