vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

v.pkgconfig: handle paths to local .pc files too (needed for homebrew) (#8290)

pull/8293/head
R cqls 2021-01-23 12:09:53 +01:00 committed by GitHub
parent ba2a15c9d7
commit 749d6133a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vlib/v/pkgconfig/pkgconfig.v
View File

@ -136,6 +136,11 @@ fn (mut pc PkgConfig) parse(file string) bool {
} }
fn (mut pc PkgConfig) resolve(pkgname string) ?string { fn (mut pc PkgConfig) resolve(pkgname string) ?string {
if pkgname.ends_with('.pc') {
if os.exists(pkgname) {
return pkgname
}
} else {
if pc.paths.len == 0 { if pc.paths.len == 0 {
pc.paths << '.' pc.paths << '.'
} }
@ -145,6 +150,7 @@ fn (mut pc PkgConfig) resolve(pkgname string) ?string {
return file return file
} }
} }
}
return error('Cannot find "$pkgname" pkgconfig file') return error('Cannot find "$pkgname" pkgconfig file')
} }