forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-18 02:40:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix the keeper-zisk build

Browse source
This commit is contained in:
Guillaume Ballet 2026-06-08 17:02:18 +02:00
parent b48d69fac1
commit 10113ba6b1
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build/ci.go
View file

@ -297,10 +297,7 @@ func doInstallKeeper(cmdline []string) {
flag.CommandLine.Parse(cmdline) flag.CommandLine.Parse(cmdline)
env := build.Env() env := build.Env()
var ( var csdb *download.ChecksumDB
csdb *download.ChecksumDB
tamagoRoot string
)
tc := build.GoToolchain{} tc := build.GoToolchain{}
if *dlgo { if *dlgo {
csdb = download.MustLoadChecksums("build/checksums.txt") csdb = download.MustLoadChecksums("build/checksums.txt")
@ -310,7 +307,7 @@ func doInstallKeeper(cmdline []string) {
log.Printf("Building keeper-%s", target.Name) log.Printf("Building keeper-%s", target.Name)
// Configure the toolchain. // Configure the toolchain.
if target.Name == "tamago" { if target.GOOS == "tamago" {
if runtime.GOOS != "linux" { if runtime.GOOS != "linux" {
log.Printf("Skipping keeper-%s (tamago builds are only supported on linux hosts)", target.Name) log.Printf("Skipping keeper-%s (tamago builds are only supported on linux hosts)", target.Name)
continue continue
@ -320,10 +317,7 @@ func doInstallKeeper(cmdline []string) {
continue continue
} }
if tamagoRoot == "" { tc.Root = downloadTamago(csdb)
tamagoRoot = downloadTamago(csdb)
}
tc.Root = tamagoRoot
} else if *dlgo { } else if *dlgo {
tc.Root = build.DownloadGo(csdb) tc.Root = build.DownloadGo(csdb)
} }
@ -520,7 +514,7 @@ func downloadTamago(csdb *download.ChecksumDB) string {
if err := build.ExtractArchive(dst, toolRoot); err != nil { if err := build.ExtractArchive(dst, toolRoot); err != nil {
log.Fatal(err) log.Fatal(err)
} }
goroot, err := filepath.Abs(filepath.Join(toolRoot, "go")) goroot, err := filepath.Abs(filepath.Join(toolRoot, "usr/local/tamago-go"))
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }