Build less for windows

This commit is contained in:
Michael Vines 2020-03-17 17:03:52 -07:00
parent f0414711b7
commit 6a213bc8f5
No known key found for this signature in database
GPG Key ID: 33F4FDEC4E0E88BD
1 changed files with 15 additions and 15 deletions

View File

@ -55,24 +55,9 @@ cargo=cargo
echo "Install location: $installDir ($buildVariant)"
cd "$(dirname "$0")"/..
./fetch-perf-libs.sh
SECONDS=0
(
set -x
# shellcheck disable=SC2086 # Don't want to double quote $rust_version
$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 "$moveLoaderDir/Cargo.toml"
cp -fv $moveLoaderDir/target/$buildVariant/libsolana_move_loader_program.* "$installDir/bin/deps"
fi
)
if [[ $CI_OS_NAME = windows ]]; then
# Limit windows to end-user command-line tools. Full validator support is not
# yet available on windows
@ -83,6 +68,21 @@ if [[ $CI_OS_NAME = windows ]]; then
solana-keygen
)
else
./fetch-perf-libs.sh
(
set -x
# shellcheck disable=SC2086 # Don't want to double quote $rust_version
$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 "$moveLoaderDir/Cargo.toml"
cp -fv $moveLoaderDir/target/$buildVariant/libsolana_move_loader_program.* "$installDir/bin/deps"
fi
)
BINS=(
solana
solana-bench-exchange