Skip to content

Commit 3459806

Browse files
authored
v.pkgconfig: restore support for multiple package names per line (#25870)
1 parent 55436ca commit 3459806

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎vlib/v/pkgconfig/main.v‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ pub fn (mut m Main) run() !string {
9494
res += pcdep.description
9595
}
9696
if unsafe { pc != 0 } {
97-
pc.extend(pcdep)!
97+
pc.extend(pcdep)
9898
} else {
9999
pc = pcdep
100100
}

‎vlib/v/pkgconfig/pkgconfig.v‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ pub fn (mut pc PkgConfig) atleast(v string) bool {
179179
return v0 > v1
180180
}
181181

182-
pub fn (mut pc PkgConfig) extend(pcdep &PkgConfig) !string {
182+
pub fn (mut pc PkgConfig) extend(pcdep &PkgConfig) string {
183183
for flag in pcdep.cflags {
184184
if pc.cflags.index(flag) == -1 {
185185
pc.cflags << flag
@@ -195,7 +195,7 @@ pub fn (mut pc PkgConfig) extend(pcdep &PkgConfig) !string {
195195
pc.libs_private << lib
196196
}
197197
}
198-
return error('')
198+
return ''
199199
}
200200

201201
fn (mut pc PkgConfig) load_requires() ! {
@@ -228,7 +228,7 @@ fn (mut pc PkgConfig) load_require(dep string) ! {
228228
if !pc.options.norecurse {
229229
pcdep.load_requires()!
230230
}
231-
pc.extend(pcdep) or {}
231+
pc.extend(pcdep)
232232
}
233233

234234
fn (mut pc PkgConfig) add_path(path string) {

0 commit comments

Comments
 (0)