From 4d7038208f612dc0dfb0ac816adafd21043acd2f Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 20 Jul 2016 11:21:26 +0100 Subject: [PATCH] Do not default to external linking on arm, i386 Reverts https://github.com/docker/docker/pull/18197 This was a workaround before Go 1.6, not required any more. cc @nalind @Govinda-Fichtner Signed-off-by: Justin Cormack --- hack/make/.binary | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/hack/make/.binary b/hack/make/.binary index d2b99b8498..cb4c26a65a 100644 --- a/hack/make/.binary +++ b/hack/make/.binary @@ -20,22 +20,6 @@ if [ "$(go env GOOS)/$(go env GOARCH)" != "$(go env GOHOSTOS)/$(go env GOHOSTARC esac fi -if [ "$(go env GOOS)" == "linux" ] ; then - case "$(go env GOARCH)" in - arm*|386) - # linking for Linux on arm or x86 needs external linking to avoid - # https://github.com/golang/go/issues/9510 until we move to Go 1.6 - if [ "$IAMSTATIC" == "true" ] ; then - export EXTLDFLAGS_STATIC="$EXTLDFLAGS_STATIC -zmuldefs" - export LDFLAGS_STATIC_DOCKER="$LDFLAGS_STATIC -extldflags \"$EXTLDFLAGS_STATIC\"" - - else - export LDFLAGS="$LDFLAGS -extldflags -zmuldefs" - fi - ;; - esac -fi - if [ "$IAMSTATIC" == "true" ] && [ "$(go env GOHOSTOS)" == "linux" ]; then if [ "${GOOS}/${GOARCH}" == "darwin/amd64" ]; then export CGO_ENABLED=1