From 0009fad346732559f90b541a62c1a2007b4765d9 Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Sat, 30 May 2026 19:19:37 +0300 Subject: [PATCH] builder, cgen: fix current master ci --- vlib/v/builder/builder.v | 14 ++++++++++++++ vlib/v/builder/cbuilder/parallel_cc.v | 2 ++ vlib/v/gen/c/coutput_test.v | 6 +++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/vlib/v/builder/builder.v b/vlib/v/builder/builder.v index 485a417b7..0f414fc97 100644 --- a/vlib/v/builder/builder.v +++ b/vlib/v/builder/builder.v @@ -850,6 +850,17 @@ fn (b &Builder) candidate_belongs_to_foreign_project(candidate_path string, impo return true } +fn (b &Builder) path_belongs_to_lookup_path(path string) bool { + abs_path := comparable_real_path(path) + for lookup in b.pref.lookup_path { + abs_lookup := comparable_real_path(lookup) + if path_is_at_or_inside(abs_path, abs_lookup) { + return true + } + } + return false +} + fn comparable_real_path(path string) string { mut normalized := os.real_path(path).replace('\\', '/') for normalized.contains('//') { @@ -907,6 +918,9 @@ pub fn (b &Builder) find_module_path(mod string, fpath string) !string { } mod_path := module_path(mod) mut module_lookup_paths := []string{} + if b.path_belongs_to_lookup_path(resolved_fpath) { + module_lookup_paths << b.pref.lookup_path + } if vmod_file_location.vmod_file.len != 0 && vmod_file_location.vmod_folder !in b.module_search_paths { module_lookup_paths << vmod_file_location.vmod_folder diff --git a/vlib/v/builder/cbuilder/parallel_cc.v b/vlib/v/builder/cbuilder/parallel_cc.v index 8fb105fee..2a4c3065e 100644 --- a/vlib/v/builder/cbuilder/parallel_cc.v +++ b/vlib/v/builder/cbuilder/parallel_cc.v @@ -105,7 +105,9 @@ fn parallel_cc(mut b builder.Builder, result c.GenOutput) ! { compile_args << tcc_b_arg mut tcc_include_dirs := [ os.join_path(tcc_install_dir, 'include'), + os.join_path(tcc_install_dir, 'include', 'winapi'), os.join_path(tcc_root_dir, 'include'), + os.join_path(tcc_root_dir, 'include', 'winapi'), ] for tcc_include_dir in tcc_include_dirs { if os.is_dir(tcc_include_dir) { diff --git a/vlib/v/gen/c/coutput_test.v b/vlib/v/gen/c/coutput_test.v index 8b6bd3190..1f8515926 100644 --- a/vlib/v/gen/c/coutput_test.v +++ b/vlib/v/gen/c/coutput_test.v @@ -254,9 +254,9 @@ fn test_comptime_for_empty_attrs_does_not_emit_new_array_calls() { compilation := os.execute(cmd) ensure_compilation_succeeded(compilation, cmd) // regression for https://github.com/vlang/v/issues/27274 - assert !compilation.output.contains('builtin____new_array_with_default(0, 0, sizeof(string), 0)') - assert !compilation.output.contains('builtin____new_array_with_default(0, 0, sizeof(VAttribute), 0)') - assert !compilation.output.contains('builtin____new_array_with_default(0, 0, sizeof(FunctionParam), 0)') + assert !compilation.output.contains('.attrs = builtin____new_array_with_default(0, 0, sizeof(string), 0)') + assert !compilation.output.contains('.attributes = builtin____new_array_with_default(0, 0, sizeof(VAttribute), 0)') + assert !compilation.output.contains('.args = builtin____new_array_with_default(0, 0, sizeof(FunctionParam), 0)') } fn test_windows_sharedlive_string_interpolation_in_ternary_does_not_emit_inline_tmp_decl() { -- 2.39.5