From 2433f050d8fb63207de09376481301353e098f1f Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Mon, 16 Dec 2013 23:43:47 -0700
Subject: [PATCH] Add "-a" back to our "go build" Upstream-commit:
 a1c5e276f4cfe4ab498b6e013e61bfc957ce6852 Component: engine

---
 components/engine/Dockerfile       | 2 +-
 components/engine/hack/make/binary | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/engine/Dockerfile b/components/engine/Dockerfile
index b06c6553e0..47fb58a693 100644
--- a/components/engine/Dockerfile
+++ b/components/engine/Dockerfile
@@ -39,7 +39,7 @@ RUN	apt-get install -y -q build-essential libsqlite3-dev
 RUN	curl -s https://go.googlecode.com/files/go1.2.src.tar.gz | tar -v -C /usr/local -xz
 ENV	PATH	/usr/local/go/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin
 ENV	GOPATH	/go:/go/src/github.com/dotcloud/docker/vendor
-RUN	cd /usr/local/go/src && ./make.bash && go install -ldflags '-w -linkmode external -extldflags "-static -Wl,--unresolved-symbols=ignore-in-shared-libs"' -tags netgo -a std
+RUN	cd /usr/local/go/src && ./make.bash
 
 # Ubuntu stuff
 RUN	apt-get install -y -q ruby1.9.3 rubygems libffi-dev
diff --git a/components/engine/hack/make/binary b/components/engine/hack/make/binary
index 93e99fee8f..a7b22979e5 100644
--- a/components/engine/hack/make/binary
+++ b/components/engine/hack/make/binary
@@ -2,5 +2,5 @@
 
 DEST=$1
 
-go build -o $DEST/docker-$VERSION -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS ./docker
+go build -a -o $DEST/docker-$VERSION -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS ./docker
 echo "Created binary: $DEST/docker-$VERSION"