Merge pull request #11455 from tianon/minor-formatting-consistency

Fix several very minor consistency issues
Upstream-commit: ae1d3d6d6851c2721bae94f0c7c0c0af9b866392
Component: engine

components/engine/hack/make/.dockerinit

@@ -14,6 +14,7 @@ go build \
 		-extldflags \"$EXTLDFLAGS_STATIC\"
 	" \
 	./dockerinit
+
 echo "Created binary: $DEST/dockerinit-$VERSION"
 ln -sf "dockerinit-$VERSION" "$DEST/dockerinit"
 

components/engine/hack/make/.dockerinit-gccgo

@@ -4,6 +4,7 @@ set -e
 IAMSTATIC="true"
 source "$(dirname "$BASH_SOURCE")/.go-autogen"
 
+# dockerinit still needs to be a static binary, even if docker is dynamic
 go build --compiler=gccgo \
 	-o "$DEST/dockerinit-$VERSION" \
 	"${BUILDFLAGS[@]}" \

components/engine/hack/make/.integration-daemon-start

@@ -2,7 +2,7 @@
 
 # see test-integration-cli for example usage of this script
 
-export PATH="$DEST/../binary:$DEST/../dynbinary:$DEST/../gccgo:$PATH"
+export PATH="$DEST/../binary:$DEST/../dynbinary:$DEST/../gccgo:$DEST/../dyngccgo:$PATH"
 
 if ! command -v docker &> /dev/null; then
 	echo >&2 'error: binary or dynbinary must be run before .integration-daemon-start'

components/engine/hack/make/binary

@@ -21,6 +21,7 @@ go build \
 		$LDFLAGS_STATIC_DOCKER
 	" \
 	./docker
+
 echo "Created binary: $DEST/$BINARY_FULLNAME"
 ln -sf "$BINARY_FULLNAME" "$DEST/docker$BINARY_EXTENSION"
 

components/engine/hack/make/dyngccgo

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e 
+set -e
 
 DEST=$1
 

components/engine/hack/make/gccgo

@@ -8,10 +8,10 @@ BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION"
 
 source "$(dirname "$BASH_SOURCE")/.go-autogen"
 
-go build --compiler=gccgo \
+go build -compiler=gccgo \
 	-o "$DEST/$BINARY_FULLNAME" \
 	"${BUILDFLAGS[@]}" \
-	--gccgoflags "
+	-gccgoflags "
 		-g
 		$EXTLDFLAGS_STATIC_DOCKER
 		-Wl,--no-export-dynamic
@@ -19,7 +19,6 @@ go build --compiler=gccgo \
 	" \
 	./docker
 
-
 echo "Created binary: $DEST/$BINARY_FULLNAME"
 ln -sf "$BINARY_FULLNAME" "$DEST/docker$BINARY_EXTENSION"