Merge pull request #32213 from aaronlehmann/plugin-build-mac

plugins: Rename plugins_linux.go to plugins_unix.go and use build tags
Upstream-commit: 8305617510b5c1c1b622ee4e0616be6fda5e3f7e
Component: engine

components/engine/hack/make/cross

@@ -31,6 +31,11 @@ for platform in $DOCKER_CROSSPLATFORMS; do
 
 		if [ "$GOOS" != "solaris" ]; then
 			# TODO. Solaris cannot be cross build because of CGO calls.
+
+			# go install docker/docker/pkg packages to ensure that
+			# they build cross platform.
+			go install github.com/docker/docker/pkg/...
+
 			if [ -z "${daemonSupporting[$platform]}" ]; then
 				# we just need a simple client for these platforms
 				export LDFLAGS_STATIC_DOCKER=""

components/engine/pkg/devicemapper/devmapper.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,cgo
 
 package devicemapper
 

components/engine/pkg/devicemapper/devmapper_log.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,cgo
 
 package devicemapper
 

components/engine/pkg/devicemapper/devmapper_wrapper.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,cgo
 
 package devicemapper
 

components/engine/pkg/devicemapper/devmapper_wrapper_deferred_remove.go

@@ -1,4 +1,4 @@
-// +build linux,!libdm_no_deferred_remove
+// +build linux,cgo,!libdm_no_deferred_remove
 
 package devicemapper
 

components/engine/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go

@@ -1,4 +1,4 @@
-// +build linux,libdm_no_deferred_remove
+// +build linux,cgo,libdm_no_deferred_remove
 
 package devicemapper
 

components/engine/pkg/devicemapper/ioctl.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,cgo
 
 package devicemapper
 

components/engine/pkg/loopback/attach_loopback.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,cgo
 
 package loopback
 

components/engine/pkg/loopback/ioctl.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,cgo
 
 package loopback
 

components/engine/pkg/loopback/loop_wrapper.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,cgo
 
 package loopback
 

components/engine/pkg/loopback/loopback.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,cgo
 
 package loopback
 

components/engine/pkg/plugins/plugins_unix.go

@@ -1,3 +1,5 @@
+// +build !windows
+
 package plugins
 
 // BasePath returns the path to which all paths returned by the plugin are relative to.