Merge pull request #844 from crosbymichael/revert-darwin

Revert "Only build shim on Linux"
This commit is contained in:
Derek McGowan 2017-05-11 11:07:29 -07:00 committed by GitHub
commit fa4e114979

View File

@ -28,7 +28,7 @@ SNAPSHOT_PACKAGES=$(shell go list ./snapshot/...)
# Project binaries. # Project binaries.
COMMANDS=ctr containerd protoc-gen-gogoctrd dist ctrd-protobuild COMMANDS=ctr containerd protoc-gen-gogoctrd dist ctrd-protobuild
ifeq ("$(GOOS)", "linux") ifneq ("$(GOOS)", "windows")
COMMANDS += containerd-shim COMMANDS += containerd-shim
endif endif
BINARIES=$(addprefix bin/,$(COMMANDS)) BINARIES=$(addprefix bin/,$(COMMANDS))