From 5cb23c814d1d71e76bb3ee27f5606e86724de76d Mon Sep 17 00:00:00 2001 From: Jack May Date: Mon, 13 Jan 2020 12:53:53 -0800 Subject: [PATCH] Install move-loader binaries (#7768) --- scripts/cargo-install-all.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/cargo-install-all.sh b/scripts/cargo-install-all.sh index 712da290a7..3ba0ee9ab4 100755 --- a/scripts/cargo-install-all.sh +++ b/scripts/cargo-install-all.sh @@ -49,6 +49,7 @@ if [[ -z "$installDir" ]]; then fi installDir="$(mkdir -p "$installDir"; cd "$installDir"; pwd)" +mkdir -p "$installDir/bin/deps" cargo=cargo echo "Install location: $installDir ($buildVariant)" @@ -64,8 +65,10 @@ SECONDS=0 $cargo $maybeRustVersion build $maybeReleaseFlag if $useMove; then + moveLoaderDir=programs/move_loader # shellcheck disable=SC2086 # Don't want to double quote $rust_version - $cargo $maybeRustVersion build $maybeReleaseFlag --manifest-path programs/move_loader/Cargo.toml + $cargo $maybeRustVersion build $maybeReleaseFlag --manifest-path "$moveLoaderDir/Cargo.toml" + cp -fv $moveLoaderDir/target/$buildVariant/libsolana_move_loader_program.* "$installDir/bin/deps" fi ) @@ -112,7 +115,6 @@ if [[ -d target/perf-libs ]]; then fi set -x -mkdir -p "$installDir/bin/deps" cp -fv target/$buildVariant/deps/libsolana*program.* "$installDir/bin/deps" echo "Done after $SECONDS seconds"