TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-12-12 00:52:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

tool/gocross: support running from outside the repo dir

Browse Source 
A bunch of us invoke tool/go from outside the repo that hosts gocross,
as a way of accessing our version-controlled toolchain. This removes
assumptions from gocross that it's being invoked within the repository
that contains its source code and toolchain configuration.

Fixes tailscale/corp#9627

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson
2023-03-20 13:50:41 -07:00
committed by Dave Anderson
parent df02bb013a
commit e7a78bc28f
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tool/gocross/toolchain.go
View File

@@ -15,11 +15,21 @@ import (
)
func toolchainRev() (string, error) {
cwd, err := os.Getwd()
// gocross gets built in the root of the repo that has toolchain
// information, so we can use os.Args[0] to locate toolchain info.
//
// We might be getting invoked via the synthetic goroot that we create, so
// walk symlinks to find the true location of gocross.
start, err := os.Executable()
if err != nil {
return "", fmt.Errorf("getting CWD: %v", err)
return "", err
}
d := cwd
start, err = filepath.EvalSymlinks(start)
if err != nil {
return "", fmt.Errorf("evaluating symlinks in %q: %v", os.Args[0], err)
}
start = filepath.Dir(start)
d := start
findTopLevel:
for {
if _, err := os.Lstat(filepath.Join(d, ".git")); err == nil {
@@ -29,7 +39,7 @@ findTopLevel:
}
d = filepath.Dir(d)
if d == "/" {
return "", fmt.Errorf("couldn't find .git starting from %q, cannot manage toolchain", cwd)
return "", fmt.Errorf("couldn't find .git starting from %q, cannot manage toolchain", start)
}
}