diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-12-11 07:51:57 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-11 07:51:57 -0800 |
| commit | b9f93774d5bb6bfb7d837d2c9d7aa1ba4f37ff94 (patch) | |
| tree | ad650a1b81396bd2c95513727f58f4b9e2a5e667 | |
| parent | 132fc26929961d472073455d0a1355661801dc52 (diff) | |
| parent | 0b0096382c8346d463ce019714fcc46256bc4af3 (diff) | |
| download | podman-b9f93774d5bb6bfb7d837d2c9d7aa1ba4f37ff94.tar.gz podman-b9f93774d5bb6bfb7d837d2c9d7aa1ba4f37ff94.tar.bz2 podman-b9f93774d5bb6bfb7d837d2c9d7aa1ba4f37ff94.zip | |
Merge pull request #1977 from vdemeester/no--i-go-build
No need to use `-i` in go build (with go 1.10 and above)
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -108,7 +108,7 @@ test/goecho/goecho: .gopathok $(wildcard test/goecho/*.go) $(GO) build -ldflags '$(LDFLAGS)' -o $@ $(PROJECT)/test/goecho podman: .gopathok $(PODMAN_VARLINK_DEPENDENCIES) - $(GO) build -i -ldflags '$(LDFLAGS_PODMAN)' -tags "$(BUILDTAGS)" -o bin/$@ $(PROJECT)/cmd/podman + $(GO) build -ldflags '$(LDFLAGS_PODMAN)' -tags "$(BUILDTAGS)" -o bin/$@ $(PROJECT)/cmd/podman local-cross: $(CROSS_BUILD_TARGETS) @@ -116,7 +116,7 @@ bin/podman.cross.%: .gopathok TARGET="$*"; \ GOOS="$${TARGET%%.*}" \ GOARCH="$${TARGET##*.}" \ - $(GO) build -i -ldflags '$(LDFLAGS_PODMAN)' -tags '$(BUILDTAGS_CROSS)' -o "$@" $(PROJECT)/cmd/podman + $(GO) build -ldflags '$(LDFLAGS_PODMAN)' -tags '$(BUILDTAGS_CROSS)' -o "$@" $(PROJECT)/cmd/podman python: ifdef HAS_PYTHON3 |