TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-14 01:47:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

v.pkgconfig: fix load_paths with ; split char on windows (#21291)

Browse Source
This commit is contained in:
谢克 2024-04-16 14:46:02 +08:00 committed by GitHub
parent ece10ede94
commit d83d5a9580
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vlib/v/pkgconfig/pkgconfig.v
View File

@ -242,9 +242,10 @@ fn (mut pc PkgConfig) load_paths() {
// Allow for full custom user control over the default paths too, through // Allow for full custom user control over the default paths too, through
// setting `PKG_CONFIG_PATH_DEFAULTS` to a list of search paths, separated // setting `PKG_CONFIG_PATH_DEFAULTS` to a list of search paths, separated
// by `:`. // by `:`.
split_c := $if windows { ';' } $else { ':' }
config_path_override := os.getenv('PKG_CONFIG_PATH_DEFAULTS') config_path_override := os.getenv('PKG_CONFIG_PATH_DEFAULTS')
if config_path_override != '' { if config_path_override != '' {
for path in config_path_override.split(':') { for path in config_path_override.split(split_c) {
pc.add_path(path) pc.add_path(path)
} }
} else { } else {
@ -254,12 +255,12 @@ fn (mut pc PkgConfig) load_paths() {
} }
} }
} }
for path in pc.options.path.split(':') { for path in pc.options.path.split(split_c) {
pc.add_path(path) pc.add_path(path)
} }
env_var := os.getenv('PKG_CONFIG_PATH') env_var := os.getenv('PKG_CONFIG_PATH')
if env_var != '' { if env_var != '' {
env_paths := env_var.trim_space().split(':') env_paths := env_var.trim_space().split(split_c)
for path in env_paths { for path in env_paths {
pc.add_path(path) pc.add_path(path)
} }