From 25cf8b2628ecd46ba2f7918866d4094459c4897a Mon Sep 17 00:00:00 2001 From: Seth Hoenig Date: Thu, 19 Nov 2020 22:26:16 -0600 Subject: [PATCH] build: add build target for darwin/arm64 Add a build target for Apple Silicon (m1) macs. Note that Go must have been built with c4f497da6f for Nomad to work on darwin/arm64 (i.e. wait for go1.16). Closes #9408 --- GNUmakefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/GNUmakefile b/GNUmakefile index 5bee6cd5c..e6834b6bc 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -53,7 +53,7 @@ endif # On MacOS, we only build for MacOS ifeq (Darwin,$(THIS_OS)) ALL_TARGETS += darwin_amd64 -# Copy CGO files for darwin into place +ALL_TARGETS += darwin_arm64 endif # On FreeBSD, we only build for FreeBSD @@ -73,6 +73,15 @@ pkg/darwin_amd64/nomad: $(SOURCE_FILES) ## Build Nomad for darwin/amd64 -tags "$(GO_TAGS)" \ -o "$@" +pkg/darwin_arm64/nomad: $(SOURCE_FILES) ## Build Nomad for darwin/arm64 + @echo "==> Building $@ with tags $(GO_TAGS)..." + @CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 \ + go build \ + -trimpath \ + -ldflags $(GO_LDFLAGS) \ + -tags "$(GO_TAGS)" \ + -o "$@" + pkg/freebsd_amd64/nomad: $(SOURCE_FILES) ## Build Nomad for freebsd/amd64 @echo "==> Building $@..." @CGO_ENABLED=1 GOOS=freebsd GOARCH=amd64 \