diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-15 15:28:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-15 15:28:45 +0200 |
| commit | 5ac617ae8af1797f8444d89290646692c14c6b1e (patch) | |
| tree | b1797ff560a8db7a534e613c8ca4a4a76f836de3 | |
| parent | a5c13bb8f7001f37b91d187163fd25913dc9d5a4 (diff) | |
| parent | ab4c9a8948b24a5390b7143131f5ed2ad634a2fb (diff) | |
| download | podman-5ac617ae8af1797f8444d89290646692c14c6b1e.tar.gz podman-5ac617ae8af1797f8444d89290646692c14c6b1e.tar.bz2 podman-5ac617ae8af1797f8444d89290646692c14c6b1e.zip | |
Merge pull request #11976 from jwhonce/issues/10737
Use CGO_ENABLED=1 when building natively on darwin
| -rw-r--r-- | Makefile | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -176,6 +176,15 @@ define go-get $(GO) get -u ${1} endef +# Need to use CGO for mDNS resolution, but cross builds need CGO disabled +# See https://github.com/golang/go/issues/12524 for details +DARWIN_GCO := 0 +ifeq ($(NATIVE_GOOS),darwin) +ifdef HOMEBREW_PREFIX + DARWIN_GCO := 1 +endif +endif + ### ### Primary entry-point targets ### @@ -351,7 +360,7 @@ podman-remote-windows: ## Build podman-remote for Windows .PHONY: podman-remote-darwin podman-remote-darwin: ## Build podman-remote for macOS $(MAKE) \ - CGO_ENABLED=0 \ + CGO_ENABLED=$(DARWIN_GCO) \ GOOS=darwin \ GOARCH=$(GOARCH) \ bin/darwin/podman |