@@ -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