From b14636f4a7e2677534d53667f3fbceb566df12f5 Mon Sep 17 00:00:00 2001 From: neojou Date: Wed, 28 Dec 2022 02:53:35 +0800 Subject: [PATCH] Compilable now Signed-off-by: neojou --- solana-1.13.5/cargo | 2 +- solana-1.13.5/ci/rust-version.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/solana-1.13.5/cargo b/solana-1.13.5/cargo index 8b30001..259e222 100755 --- a/solana-1.13.5/cargo +++ b/solana-1.13.5/cargo @@ -25,4 +25,4 @@ case "$1" in esac set -x -exec cargo "+${toolchain}" "${@}" +exec cargo "${@}" diff --git a/solana-1.13.5/ci/rust-version.sh b/solana-1.13.5/ci/rust-version.sh index 5926edb..0b87b00 100644 --- a/solana-1.13.5/ci/rust-version.sh +++ b/solana-1.13.5/ci/rust-version.sh @@ -38,10 +38,11 @@ export rust_nightly_docker_image=solanalabs/rust-nightly:"$nightly_version" rustup_install() { declare toolchain=$1 - if ! cargo +"$toolchain" -V > /dev/null; then +# if ! cargo +"$toolchain" -V > /dev/null; then + if ! cargo -vv build > /dev/null; then echo "$0: Missing toolchain? Installing...: $toolchain" >&2 rustup install "$toolchain" - cargo +"$toolchain" -V + cargo -vv build fi }