Browse code

Adjust build tags to be client-only in "make cross" too

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)

Tianon Gravi authored on 2014/08/02 07:57:28
Showing 1 changed files
... ...
@@ -3,6 +3,12 @@ set -e
3 3
 
4 4
 DEST=$1
5 5
 
6
+# explicit list of os/arch combos that support being a daemon
7
+declare -A daemonSupporting
8
+daemonSupporting=(
9
+	[linux/amd64]=1
10
+)
11
+
6 12
 # if we have our linux/amd64 version compiled, let's symlink it in
7 13
 if [ -x "$DEST/../binary/docker-$VERSION" ]; then
8 14
 	mkdir -p "$DEST/linux/amd64"
... ...
@@ -18,7 +24,10 @@ for platform in $DOCKER_CROSSPLATFORMS; do
18 18
 		mkdir -p "$DEST/$platform" # bundles/VERSION/cross/GOOS/GOARCH/docker-VERSION
19 19
 		export GOOS=${platform%/*}
20 20
 		export GOARCH=${platform##*/}
21
-		export LDFLAGS_STATIC_DOCKER="" # we just need a simple client for these platforms (TODO this might change someday)
21
+		if [ -z "${daemonSupporting[$platform]}" ]; then
22
+			export LDFLAGS_STATIC_DOCKER="" # we just need a simple client for these platforms
23
+			export BUILDFLAGS=( "${BUILDFLAGS[@]/ daemon/}" ) # remove the "daemon" build tag from platforms that aren't supported
24
+		fi
22 25
 		source "$(dirname "$BASH_SOURCE")/binary" "$DEST/$platform"
23 26
 	)
24 27
 done