diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2021-01-19 10:27:01 +0100 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2021-01-29 15:27:05 -0500 |
| commit | 960baf1a0966794779ffe88b1e3f77f02993d764 (patch) | |
| tree | 1f4952b694003e6169284112412278770e30391e | |
| parent | 9fa6aa885b64057f974b866506e0909d1cd30a4a (diff) | |
| download | podman-960baf1a0966794779ffe88b1e3f77f02993d764.tar.gz podman-960baf1a0966794779ffe88b1e3f77f02993d764.tar.bz2 podman-960baf1a0966794779ffe88b1e3f77f02993d764.zip | |
make bindings generation more robuts
The Go gods did not shine upon us trying to understand what's going on
in #9000. The symptom is that `go generate` did not add required
imports to a generated file, ultimately breaking subsequent compilation.
While it still remains unclear *why* Go is behaving like that, the
symptom disappears when `go generate` runs in module mode; that is
without `-mod=vendor` and without `GO111MODULE=off`. This was
reproducible on two separate machines (Ubuntu and Fedora).
Also, when facing an unset GOPATH, set it to Go's default (i.e.,
$HOME/go) and make sure that GOBIN is in PATH since `goimports`
is required by `go generate`.
Fixes: #9000
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| -rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -86,7 +86,7 @@ PODMAN_SERVER_LOG ?= # If GOPATH not specified, use one in the local directory ifeq ($(GOPATH),) -export GOPATH := $(CURDIR)/_output +export GOPATH := $(HOME)/go unexport GOBIN endif FIRST_GOPATH := $(firstword $(subst :, ,$(GOPATH))) @@ -98,6 +98,8 @@ ifeq ($(GOBIN),) GOBIN := $(FIRST_GOPATH)/bin endif +export PATH := $(PATH):$(GOBIN) + GOMD2MAN ?= $(shell command -v go-md2man || echo '$(GOBIN)/go-md2man') CROSS_BUILD_TARGETS := \ @@ -462,7 +464,7 @@ podman-remote-%-release: BINDINGS_SOURCE = $(wildcard pkg/bindings/**/types.go) .generate-bindings: $(BINDINGS_SOURCE) ifneq ($(shell uname -s), Darwin) - $(GO) generate -mod=vendor ./pkg/bindings/... ; + GO111MODULE=off $(GO) generate ./pkg/bindings/... ; endif touch .generate-bindings |