Skip to content

fix: multi /pkg/<module> problem #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: multi /pkg/<module> problem #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions go/tools/builders/compilepkg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ func compileArchive(
packageListPath string,
outPath string,
outXPath string,
cgoExportHPath string) error {

cgoExportHPath string,
) error {
workDir, cleanup, err := goenv.workDir()
if err != nil {
return err
Expand Down Expand Up @@ -293,7 +293,14 @@ func compileArchive(
// path. We use -trimpath to replace the root path with the correct prefix
// of the package path.
root := abs(".")
relSrcPath, err := filepath.Rel(root, srcs.goSrcs[0].filename)
srcFullPath := srcs.goSrcs[0].filename
for _, goSrc := range srcs.goSrcs {
if !strings.HasSuffix(goSrc.filename, ".pb.go") {
srcFullPath = goSrc.filename
break
}
}
relSrcPath, err := filepath.Rel(root, srcFullPath)
if err != nil {
return err
}
Expand Down Expand Up @@ -407,8 +414,8 @@ func compileArchive(
// Compile the .s files.
if len(srcs.sSrcs) > 0 {
includeSet := map[string]struct{}{
filepath.Join(os.Getenv("GOROOT"), "pkg", "include"): struct{}{},
workDir: struct{}{},
filepath.Join(os.Getenv("GOROOT"), "pkg", "include"): {},
workDir: {},
}
for _, hdr := range srcs.hSrcs {
includeSet[filepath.Dir(hdr.filename)] = struct{}{}
Expand Down