From 650c882d3c53db118b01dd5e15fa1bc0ddaa36f1 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Thu, 15 Apr 2021 11:28:05 -0400
Subject: [PATCH] cli: use external GO111MODULE and cross compiler

Upstream-Status: Inappropriate [embedded specific]

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 git/cli/scripts/build/binary | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: docker-moby-28.3.0+gite0183475e03cd05b6a560d8b22fe0a83cd1cba14/cli/scripts/build/binary
===================================================================
--- docker-moby-28.3.0+gite0183475e03cd05b6a560d8b22fe0a83cd1cba14.orig/cli/scripts/build/binary
+++ docker-moby-28.3.0+gite0183475e03cd05b6a560d8b22fe0a83cd1cba14/cli/scripts/build/binary
@@ -13,8 +13,6 @@ fi
 
 echo "Building $GO_LINKMODE $(basename "${TARGET}")"
 
-export GO111MODULE=auto
-
 if [ "$(go env GOOS)" = "windows" ]; then
   if [ ! -x "$(command -v goversioninfo)" ]; then
     >&2 echo "goversioninfo not found, skipping manifesting binary"
@@ -24,6 +22,6 @@ if [ "$(go env GOOS)" = "windows" ]; the
   fi
 fi
 
-(set -x ; go build -o "${TARGET}" -tags "${GO_BUILDTAGS}" -ldflags "${GO_LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}")
+(set -x ; ${GO} build -trimpath -o "${TARGET}" -tags "${GO_BUILDTAGS}" -ldflags "${GO_LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}")
 
 ln -sf "$(basename "${TARGET}")" "$(dirname "${TARGET}")/docker"
