From d83d5a95809606fa2ba46ce60cfe443b54e4adc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E5=85=8B?= <1023052645@qq.com> Date: Tue, 16 Apr 2024 14:46:02 +0800 Subject: [PATCH] v.pkgconfig: fix load_paths with `;` split char on windows (#21291) --- vlib/v/pkgconfig/pkgconfig.v | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vlib/v/pkgconfig/pkgconfig.v b/vlib/v/pkgconfig/pkgconfig.v index ba034e7129..c9a6b88a00 100644 --- a/vlib/v/pkgconfig/pkgconfig.v +++ b/vlib/v/pkgconfig/pkgconfig.v @@ -242,9 +242,10 @@ fn (mut pc PkgConfig) load_paths() { // Allow for full custom user control over the default paths too, through // setting `PKG_CONFIG_PATH_DEFAULTS` to a list of search paths, separated // by `:`. + split_c := $if windows { ';' } $else { ':' } config_path_override := os.getenv('PKG_CONFIG_PATH_DEFAULTS') if config_path_override != '' { - for path in config_path_override.split(':') { + for path in config_path_override.split(split_c) { pc.add_path(path) } } 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) } env_var := os.getenv('PKG_CONFIG_PATH') if env_var != '' { - env_paths := env_var.trim_space().split(':') + env_paths := env_var.trim_space().split(split_c) for path in env_paths { pc.add_path(path) }