Skip to content

Commit

Permalink
pass path flag when generating symabis (#239)
Browse files Browse the repository at this point in the history
Previously we were creating the path args but not passing it to the command
  • Loading branch information
goddenrich authored Feb 26, 2024
1 parent 36e505b commit b3919e6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 4 additions & 0 deletions tools/please_go/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Version 1.10.4
--------------
* correctly pass the path flag to gensymabis

Version 1.10.3
--------------
* Support assembly correctly for Go 1.22 (#227)
Expand Down
2 changes: 1 addition & 1 deletion tools/please_go/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.10.3
1.10.4
4 changes: 1 addition & 3 deletions tools/please_go/install/toolchain/toolchain.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,7 @@ func (tc *Toolchain) Symabis(importpath, sourceDir, objectDir string, asmFiles [
return "", "", err
}

// Although we don't set both `-p` and `-trimpath` flag here, they show up in `go build -work -n -a`.
// It doesn't seem to cause things to break without them so far, but leaving this note here for future reference.
err := tc.Exec.Run("(cd %s; %s tool asm -I %s -I %s/pkg/include -D GOOS_%s -D GOARCH_%s -gensymabis -o %s %s)", sourceDir, tc.GoTool, objectDir, build.Default.GOROOT, build.Default.GOOS, build.Default.GOARCH, symabis, paths(asmFiles))
err := tc.Exec.Run("(cd %s; %s tool asm -I %s -I %s/pkg/include -D GOOS_%s -D GOARCH_%s -gensymabis %s -o %s %s)", sourceDir, tc.GoTool, objectDir, build.Default.GOROOT, build.Default.GOOS, build.Default.GOARCH, importpath, symabis, paths(asmFiles))

return asmH, symabis, err
}
Expand Down

0 comments on commit b3919e6

Please sign in to comment.