blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Switch from arm64-apple-darwin to aarch64-apple-darwin to align with Rust's target names

This commit is contained in:
Michael Vines 2022-01-03 16:51:25 -08:00
parent 5b6027bef0
commit 25cb859ed0
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ci/publish-tarball.sh
View File

@ -39,7 +39,11 @@ fi
case "$CI_OS_NAME" in case "$CI_OS_NAME" in
osx) osx)
TARGET=$(uname -m)-apple-darwin _cputype="$(uname -m)"
if [[ $_cputype = arm64 ]]; then
_cputype=aarch64
fi
TARGET=${_cputype}-apple-darwin
;; ;;
linux) linux)
TARGET=x86_64-unknown-linux-gnu TARGET=x86_64-unknown-linux-gnu

13
install/solana-install-init.sh
View File

@ -62,17 +62,24 @@ main() {
esac esac
done done
case "$(uname)" in _ostype="$(uname -s)"
_cputype="$(uname -m)"
case "$_ostype" in
Linux) Linux)
TARGET=x86_64-unknown-linux-gnu _ostype=unknown-linux-gnu
;; ;;
Darwin) Darwin)
TARGET=$(uname -m)-apple-darwin if [[ $_cputype = arm64 ]]; then
_cputype=aarch64
fi
_ostype=apple-darwin
;; ;;
*) *)
err "machine architecture is currently unsupported" err "machine architecture is currently unsupported"
;; ;;
esac esac
TARGET="${_cputype}-${_ostype}"
temp_dir="$(mktemp -d 2>/dev/null || ensure mktemp -d -t solana-install-init)" temp_dir="$(mktemp -d 2>/dev/null || ensure mktemp -d -t solana-install-init)"
ensure mkdir -p "$temp_dir" ensure mkdir -p "$temp_dir"

2
scripts/solana-install-deploy.sh
View File

@ -31,7 +31,7 @@ fi
case "$OS" in case "$OS" in
osx) osx)
TARGET=$(uname -m)-apple-darwin TARGET=x86_64-apple-darwin
;; ;;
linux) linux)
TARGET=x86_64-unknown-linux-gnu TARGET=x86_64-unknown-linux-gnu