To be on the safe side when detecting 64bit arm #72

This commit is contained in:
Bob Mottram 2017-09-18 15:50:36 +01:00
parent f836b17643
commit a6ed88fea5
2 changed files with 3 additions and 3 deletions

View File

@ -1167,7 +1167,7 @@ function image_setup_utils {
if [[ $ARCHITECTURE == *"arm"* ]]; then if [[ $ARCHITECTURE == *"arm"* ]]; then
GOARCH=armv6l GOARCH=armv6l
fi fi
if [[ $ARCHITECTURE == *"aarch"* ]]; then if [[ $ARCHITECTURE == *"aarch"* || $ARCHITECTURE == *"arm64"* ]]; then
GOARCH=arm64 GOARCH=arm64
fi fi
if [ ! $GOARCH ]; then if [ ! $GOARCH ]; then

View File

@ -147,7 +147,7 @@ function mesh_upgrade_golang {
if [[ $ARCHITECTURE == *"arm"* ]]; then if [[ $ARCHITECTURE == *"arm"* ]]; then
GOARCH=armv6l GOARCH=armv6l
fi fi
if [[ $ARCHITECTURE == *"aarch"* ]]; then if [[ $ARCHITECTURE == *"aarch"* || $ARCHITECTURE == *"arm64"* ]]; then
GOARCH=arm64 GOARCH=arm64
fi fi
if [ ! $GOARCH ]; then if [ ! $GOARCH ]; then
@ -157,7 +157,7 @@ function mesh_upgrade_golang {
GOARCH=armv6l GOARCH=armv6l
echo $"Using $GOARCH" echo $"Using $GOARCH"
fi fi
if [[ $ARCHITECTURE == *"aarch"* ]]; then if [[ $ARCHITECTURE == *"aarch"* || $ARCHITECTURE == *"arm64"* ]]; then
GOARCH=arm64 GOARCH=arm64
echo $"Using $GOARCH" echo $"Using $GOARCH"
fi fi