diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 1c010b6034..8c52d14f5f 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -1332,7 +1332,7 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.9.21" +version = "0.9.22" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1697,7 +1697,7 @@ dependencies = [ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "reqwest 0.9.21 (registry+https://github.com/rust-lang/crates.io-index)", + "reqwest 0.9.22 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "solana-ed25519-dalek 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1740,7 +1740,7 @@ dependencies = [ "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "reqwest 0.9.21 (registry+https://github.com/rust-lang/crates.io-index)", + "reqwest 0.9.22 (registry+https://github.com/rust-lang/crates.io-index)", "solana-sdk 0.20.0", "sys-info 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2647,7 +2647,7 @@ dependencies = [ "checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -"checksum reqwest 0.9.21 (registry+https://github.com/rust-lang/crates.io-index)" = "02b7e953e14c6f3102b7e8d1f1ee3abf5ecee80b427f5565c9389835cecae95c" +"checksum reqwest 0.9.22 (registry+https://github.com/rust-lang/crates.io-index)" = "2c2064233e442ce85c77231ebd67d9eca395207dec2127fe0bbedde4bd29a650" "checksum rgb 0.8.14 (registry+https://github.com/rust-lang/crates.io-index)" = "2089e4031214d129e201f8c3c8c2fe97cd7322478a0d1cdf78e7029b0042efdb" "checksum ring 0.16.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6747f8da1f2b1fabbee1aaa4eb8a11abf9adef0bf58a41cee45db5d59cecdfac" "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" diff --git a/programs/bpf/rust/do.sh b/programs/bpf/rust/do.sh index b25f7bc522..248ab573a5 100755 --- a/programs/bpf/rust/do.sh +++ b/programs/bpf/rust/do.sh @@ -28,13 +28,13 @@ perform_action() { set -e case "$1" in build) - bash -x "$sdkDir"/bpf/rust/build.sh "$2" + "$sdkDir"/bpf/rust/build.sh "$2" so_path="$targetDir/$profile/" so_name="solana_bpf_rust_${3%/}" if [ -f "$so_path/${so_name}.so" ]; then cp "$so_path/${so_name}.so" "$so_path/${so_name}_debug.so" - "$sdkDir"/bpf/dependencies/llvm-native/bin/llvm-objcopy --strip-all "$so_path/${so_name}.so" "$so_path/$so_name.so" + "$sdkDir/bpf/dependencies/llvm-native/bin/llvm-objcopy" --strip-all "$so_path/${so_name}.so" "$so_path/$so_name.so" fi ;; clean) @@ -67,11 +67,11 @@ perform_action() { # - rustfilt ( pwd - ./do.sh build "$3" + "$0" build "$3" cd "$3" - so="$targetDir"/"$profile"/solana_bpf_rust_"${3%/}"_debug.so - dump="$targetDir"/"${3%/}"-dump + so="$targetDir/$profile/solana_bpf_rust_${3%/}_debug.so" + dump="$targetDir/${3%/}-dump" if [ -f "$so" ]; then ls \ @@ -82,7 +82,7 @@ perform_action() { -aW \ "$so" \ >>"${dump}-mangled.txt" - ../"$sdkDir"/bpf/dependencies/llvm-native/bin/llvm-objdump \ + ../"$sdkDir/bpf/dependencies/llvm-native/bin/llvm-objdump" \ -print-imm-hex \ --source \ --disassemble \