Skip to content

PackageLoading: anchor relative paths for Windows #6345

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

Merged
merged 1 commit into from
Mar 29, 2023
Merged

PackageLoading: anchor relative paths for Windows #6345

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
7 changes: 4 additions & 3 deletions Sources/PackageLoading/PackageBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1036,9 +1036,10 @@ public final class PackageBuilder {
}

// Ensure that the search path is contained within the package.
let subpath = try RelativePath(validating: value)
guard targetRoot.appending(subpath).isDescendantOfOrEqual(to: self.packagePath) else {
throw ModuleError.invalidHeaderSearchPath(subpath.pathString)
_ = try RelativePath(validating: value)
let path = try AbsolutePath(value, relativeTo: targetRoot)
guard path.isDescendantOfOrEqual(to: self.packagePath) else {
throw ModuleError.invalidHeaderSearchPath(value)
}

case .define(let value):
Expand Down