From 3557d0690ada66314337dbeeb41f283c602a0f37 Mon Sep 17 00:00:00 2001 From: Jared Palmer Date: Fri, 1 Apr 2022 11:40:27 -0400 Subject: [PATCH 1/2] Use CGO on macOS M1 arm --- cli/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cli/Makefile b/cli/Makefile index c70f88d6544fa..b76be6c6f8ca9 100644 --- a/cli/Makefile +++ b/cli/Makefile @@ -90,6 +90,12 @@ platform-unixlike: cd "$(NPMDIR)" && npm version "$(TURBO_VERSION)" --allow-same-version CGO_ENABLED=0 GOOS="$(GOOS)" GOARCH="$(GOARCH)" go build $(GO_FLAGS) -o "$(NPMDIR)/bin/turbo" ./cmd/turbo +platform-unixlike-cgo: + test -n "$(GOOS)" && test -n "$(GOARCH)" && test -n "$(NPMDIR)" + mkdir -p "$(NPMDIR)/bin" + cd "$(NPMDIR)" && npm version "$(TURBO_VERSION)" --allow-same-version + CGO_ENABLED=1 GOOS="$(GOOS)" GOARCH="$(GOARCH)" go build $(GO_FLAGS) -o "$(NPMDIR)/bin/turbo" ./cmd/turbo + platform-android-arm64: make GOOS=android GOARCH=arm64 NPMDIR=npm/turbo-android-arm64 platform-unixlike @@ -97,7 +103,7 @@ platform-darwin: make GOOS=darwin GOARCH=amd64 NPMDIR=npm/turbo-darwin-64 platform-unixlike platform-darwin-arm64: - make GOOS=darwin GOARCH=arm64 NPMDIR=npm/turbo-darwin-arm64 platform-unixlike + make GOOS=darwin GOARCH=arm64 NPMDIR=npm/turbo-darwin-arm64 platform-unixlike-cgo platform-freebsd: make GOOS=freebsd GOARCH=amd64 NPMDIR=npm/turbo-freebsd-64 platform-unixlike From ab0679c77fd809c06bd5315d30d832adca249944 Mon Sep 17 00:00:00 2001 From: Jared Palmer Date: Fri, 1 Apr 2022 11:46:38 -0400 Subject: [PATCH 2/2] Add comment --- cli/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cli/Makefile b/cli/Makefile index b76be6c6f8ca9..550ff4ff7a0b9 100644 --- a/cli/Makefile +++ b/cli/Makefile @@ -90,6 +90,8 @@ platform-unixlike: cd "$(NPMDIR)" && npm version "$(TURBO_VERSION)" --allow-same-version CGO_ENABLED=0 GOOS="$(GOOS)" GOARCH="$(GOARCH)" go build $(GO_FLAGS) -o "$(NPMDIR)/bin/turbo" ./cmd/turbo +# To fix https://github.com/vercel/turborepo/issues/941 (DNS issue), +# we compile the darwin-arm64 binary with CGO_ENABLED=1 on an macOS M1 platform-unixlike-cgo: test -n "$(GOOS)" && test -n "$(GOARCH)" && test -n "$(NPMDIR)" mkdir -p "$(NPMDIR)/bin"