From eb7698949e6f8d4d148fc888679ba0bd7209ab35 Mon Sep 17 00:00:00 2001
From: Aaron Lehmann <aaron.lehmann@docker.com>
Date: Wed, 29 Mar 2017 15:58:03 -0700
Subject: [PATCH] Add line to hack/make/cross to cross-compile pkgs directory

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 8eb7edab7cc62bcbf581713f3f1e615cfdef04b4
Component: engine
---
 components/engine/hack/make/cross | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/engine/hack/make/cross b/components/engine/hack/make/cross
index d4dbb369a6..94d2ddf678 100644
--- a/components/engine/hack/make/cross
+++ b/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=""