Skip to content

Commit

Permalink
Clarify comment for Package.resolveIncludedFile
Browse files Browse the repository at this point in the history
  • Loading branch information
rillig committed Sep 10, 2023
1 parent 90cfd99 commit 3f5e1ad
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions v23/package.go
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,8 @@ func (pkg *Package) checkIncludePath(mkline *MkLine, canonicalRel CurrPath) {
}

// resolveIncludedFile resolves Makefile variables such as ${PKGPATH} to
// their actual values.
// their actual values, returning an empty path if there are any expressions
// left that cannot be resolved.
func (pkg *Package) resolveIncludedFile(mkline *MkLine, includingFilename CurrPath) RelPath {

// TODO: Try to combine resolveVariableRefs and ResolveVarsInRelativePath.
Expand Down Expand Up @@ -483,9 +484,6 @@ func (pkg *Package) resolveIncludedFile(mkline *MkLine, includingFilename CurrPa
}

// shouldDiveInto decides whether to load the includedFile.
//
// The includingFile is relative to the current working directory,
// the includedFile is taken directly from the .include directive.
func (pkg *Package) shouldDiveInto(includingFile CurrPath, includedFile RelPath) bool {

if includedFile.HasSuffixPath("bsd.pkg.mk") || IsPrefs(includedFile) {
Expand Down

0 comments on commit 3f5e1ad

Please sign in to comment.