summaryrefslogtreecommitdiffstats
path: root/recipes-containers/docker/files/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-containers/docker/files/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch')
-rw-r--r--recipes-containers/docker/files/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch15
1 files changed, 6 insertions, 9 deletions
diff --git a/recipes-containers/docker/files/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch b/recipes-containers/docker/files/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch
index dc322612..16b5f9e5 100644
--- a/recipes-containers/docker/files/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch
+++ b/recipes-containers/docker/files/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch
@@ -8,20 +8,17 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
8 git/cli/scripts/build/binary | 3 +-- 8 git/cli/scripts/build/binary | 3 +--
9 1 file changed, 1 insertion(+), 2 deletions(-) 9 1 file changed, 1 insertion(+), 2 deletions(-)
10 10
11diff --git git/cli/scripts/build/binary git/cli/scripts/build/binary 11Index: git/cli/scripts/build/binary
12index e4c5e12a6b..7c47b75c2f 100755 12===================================================================
13--- git/cli/scripts/build/binary 13--- git.orig/cli/scripts/build/binary
14+++ git/cli/scripts/build/binary 14+++ git/cli/scripts/build/binary
15@@ -73,8 +73,7 @@ fi 15@@ -73,8 +73,7 @@
16 16
17 echo "Building $GO_LINKMODE $(basename "${TARGET}")" 17 echo "Building $GO_LINKMODE $(basename "${TARGET}")"
18 18
19-export GO111MODULE=auto 19-export GO111MODULE=auto
20 20
21-go build -o "${TARGET}" -tags "${GO_BUILDTAGS}" --ldflags "${LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}" 21-go build -o "${TARGET}" -tags "${GO_BUILDTAGS}" --ldflags "${GO_LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}"
22+${GO} build -o "${TARGET}" -tags "${GO_BUILDTAGS}" --ldflags "${LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}" 22+${GO} build -o "${TARGET}" -tags "${GO_BUILDTAGS}" --ldflags "${GO_LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}"
23 23
24 ln -sf "$(basename "${TARGET}")" "$(dirname "${TARGET}")/docker" 24 ln -sf "$(basename "${TARGET}")" "$(dirname "${TARGET}")/docker"
25--
262.19.1
27