mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-10-31 08:21:49 +01:00
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From 0f1af7489b0c0de4ef7e54e009ba70b51b0b6dc8 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Robert=20G=C3=BCnzler?= <r@gnzler.io>
|
|
Date: Wed, 21 Sep 2022 14:33:41 +0200
|
|
Subject: [PATCH] find go in /usr/bin
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
GOROOT is unset in abuild environment
|
|
|
|
Signed-off-by: Robert Günzler <r@gnzler.io>
|
|
---
|
|
net/tlsdial/tlsdial_test.go | 2 +-
|
|
tstest/integration/integration.go | 2 +-
|
|
version/modinfo_test.go | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/tstest/integration/integration.go b/tstest/integration/integration.go
|
|
index f6dbb3a..f46a9e5 100644
|
|
--- a/tstest/integration/integration.go
|
|
+++ b/tstest/integration/integration.go
|
|
@@ -130,7 +130,7 @@ func build(outDir string, targets ...string) error {
|
|
}
|
|
|
|
func findGo() (string, error) {
|
|
- goBin := filepath.Join(runtime.GOROOT(), "bin", "go"+exe())
|
|
+ goBin := filepath.Join("/usr", "bin", "go"+exe())
|
|
if fi, err := os.Stat(goBin); err != nil {
|
|
if os.IsNotExist(err) {
|
|
return "", fmt.Errorf("failed to find go at %v", goBin)
|