github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1987 from schomatis/revert-1937-add-native-build-i-option

Browse Source 
Remove go build option '-i' for native builds
This commit is contained in:
Michael Crosby 2018-01-10 11:27:47 -05:00 committed by GitHub
commit c602b85f80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -11,11 +11,9 @@ REVISION=$(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet
ifneq "$(strip $(shell command -v go 2>/dev/null))" "" ifneq "$(strip $(shell command -v go 2>/dev/null))" ""
GOOS ?= $(shell go env GOOS) GOOS ?= $(shell go env GOOS)
GOARCH ?= $(shell go env GOARCH) GOARCH ?= $(shell go env GOARCH)
GOHOSTOS ?= $(shell go env GOHOSTOS)
else else
GOOS ?= $$GOOS GOOS ?= $$GOOS
GOARCH ?= $$GOARCH GOARCH ?= $$GOARCH
GOHOSTOS ?= $$GOHOSTOS
endif endif
WHALE = "🇩" WHALE = "🇩"
@ -53,14 +51,6 @@ GO_BUILD_FLAGS=
#include platform specific makefile #include platform specific makefile
-include Makefile.$(GOOS) -include Makefile.$(GOOS)
# Add the "incremental" build option `-i` (installs the packages that are
# dependencies of the target) to speed up future builds. Only for native builds,
# otherwise it will try to install in the incorrect (not native) path and fail.
# Note: this won't be necessary from 1.10 (https://tip.golang.org/doc/go1.10#build)
ifeq ($(GOOS), $(GOHOSTOS))
GO_BUILD_FLAGS += -i
endif
# Flags passed to `go test` # Flags passed to `go test`
TESTFLAGS ?= -v $(TESTFLAGS_RACE) TESTFLAGS ?= -v $(TESTFLAGS_RACE)
TESTFLAGS_PARALLEL ?= 8 TESTFLAGS_PARALLEL ?= 8