diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-22 20:02:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-22 20:02:32 +0200 |
| commit | 4af2081424c8fa7ac191e9c5231d2429edb8327c (patch) | |
| tree | 82d3478331c5ed731f79d7acfa87421830bc9400 | |
| parent | 13924bac11a8b6bc24f5fdf8cd314dce0ed48b58 (diff) | |
| parent | 0ac4061bdbee590a3ff3add09daed92988c04481 (diff) | |
| download | podman-4af2081424c8fa7ac191e9c5231d2429edb8327c.tar.gz podman-4af2081424c8fa7ac191e9c5231d2429edb8327c.tar.bz2 podman-4af2081424c8fa7ac191e9c5231d2429edb8327c.zip | |
Merge pull request #6711 from lsm5/v2.0-custom-GO_BUILD-backport
Makefile: allow customizable GO_BUILD
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -38,10 +38,10 @@ PRE_COMMIT = $(shell command -v bin/venv/bin/pre-commit ~/.local/bin/pre-commit SOURCES = $(shell find . -path './.*' -prune -o -name "*.go") -GO_BUILD=$(GO) build +GO_BUILD ?= $(GO) build # Go module support: set `-mod=vendor` to use the vendored sources ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true) - GO_BUILD=GO111MODULE=on $(GO) build -mod=vendor + GO_BUILD ?= GO111MODULE=on $(GO) build -mod=vendor endif BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay |