Fix darwin-arm64 builds

algorand · Jun 15, 2021 · 6997588 · 6997588
1 parent 02eacd1
commit 6997588
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/crypto/curve25519.go b/crypto/curve25519.go
@@ -19,6 +19,8 @@ package crypto
 // #cgo CFLAGS: -Wall -std=c99
 // #cgo darwin,amd64 CFLAGS: -I${SRCDIR}/libs/darwin/amd64/include
 // #cgo darwin,amd64 LDFLAGS: ${SRCDIR}/libs/darwin/amd64/lib/libsodium.a
+// #cgo darwin,arm64 CFLAGS: -I${SRCDIR}/libs/darwin/arm64/include
+// #cgo darwin,arm64 LDFLAGS: ${SRCDIR}/libs/darwin/arm64/lib/libsodium.a
 // #cgo linux,amd64 CFLAGS: -I${SRCDIR}/libs/linux/amd64/include
 // #cgo linux,amd64 LDFLAGS: ${SRCDIR}/libs/linux/amd64/lib/libsodium.a
 // #cgo linux,arm64 CFLAGS: -I${SRCDIR}/libs/linux/arm64/include

diff --git a/installer/external/node_exporter-stable-darwin-arm64.tar.gz b/installer/external/node_exporter-stable-darwin-arm64.tar.gz
diff --git a/scripts/archtype.sh b/scripts/archtype.sh
@@ -8,7 +8,7 @@ elif [[ "${ARCH}" = "armv6l" ]]; then
     echo "arm"
 elif [[ "${ARCH}" = "armv7l" ]]; then
     echo "arm"
-elif [[ "${ARCH}" = "aarch64" ]]; then
+elif [[ "${ARCH}" = "aarch64" ]] || [[ "${ARCH}" = "arm64" ]]; then
     echo "arm64"
 else
     # Anything else needs to be specifically added...