Skip to content
Merged
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions tools/driver/packages/packages.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,12 @@ func packagesToResponse(rootpath string, pkgs []*packages.Package, dirs map[stri
for i, file := range pkg.GoFiles {
// This is pretty awkward; we need to try to figure out where these files exist now,
// which isn't particularly clear to the build actions that generated them.
if path := filepath.Join(rootpath, "plz-out/subrepos", file); pathExists(path) {
if pathExists(file) {
pkg.GoFiles[i] = filepath.Join(rootpath, file)
} else if path := filepath.Join(rootpath, "plz-out/subrepos", file); pathExists(path) {
pkg.GoFiles[i] = path
} else if path := filepath.Join(rootpath, "plz-out/gen", file); pathExists(path) {
pkg.GoFiles[i] = path
} else {
pkg.GoFiles[i] = filepath.Join(rootpath, file)
}
}
pkg.CompiledGoFiles = pkg.GoFiles
Expand Down