more accurate name for the function that queries test linker path

This commit is contained in:
Nikita Smith authored and Ryan Fleury committed 2026-09-21 09:08:03 -07:00
1 parent 44a37e2a80
commit 51bd5e0882
4 files changed
+14 -13

No files matched your search

+1 -1
View File
@@ -199,7 +199,7 @@ dw_input_from_writer(Arena *arena, DW_Writer *writer)
String8 raw_coff = coff_from_obj(scratch.arena, obj);
t_write_file(str8_lit("dwarf.obj"), raw_coff);
t_invoke(t_radlink_path(), str8_lit("/subsystem:console /entry:entry /out:a.exe /debug:full dwarf.obj"), max_U64);
t_invoke(t_linker_path(), str8_lit("/subsystem:console /entry:entry /out:a.exe /debug:full dwarf.obj"), max_U64);
delete_file_at_path(t_make_file_path(scratch.arena, str8_lit("a.pdb")));
String8 exe = t_read_file(arena, str8_lit("a.exe"));
+1 -1
View File
@@ -1503,7 +1503,7 @@ internal TEST_FUNCTION_DEF(dbg_script_runner)
}
// run linkers
String8 linker_path = t_radlink_path();
String8 linker_path = t_linker_path();
for EachNode(directive, T_DbgScriptDirective, script.directives[OperatingSystem_CURRENT][T_DbgScriptDirectiveKind_Link].first) {
String8 expanded_args = lnk_expand_env_vars_windows(arena, script_vars, directive->args);
if (t_invoke(linker_path, expanded_args, max_U64) == 0) {
+10 -9
View File
@@ -59,10 +59,10 @@ t_test_layer_from_name(Arena *arena, String8 pattern)
internal Linker
t_id_linker(void)
{
String8 name = str8_chop_last_dot(str8_skip_last_slash(g_linker_path));
if (str8_match(name, str8_lit("radlink"), StringMatchFlag_CaseInsensitive)) { return Linker_radlink; }
if (str8_match(name, str8_lit("link"), StringMatchFlag_CaseInsensitive)) { return Linker_msvc; }
if (str8_match(name, str8_lit("lld-link"), StringMatchFlag_CaseInsensitive)) { return Linker_lld; }
String8 name = str8_chop_last_dot(str8_skip_last_slash(t_linker_path()));
if (str8_matchi(name, str8_lit("radlink"))) { return Linker_radlink; }
if (str8_matchi(name, str8_lit("link"))) { return Linker_msvc; }
if (str8_matchi(name, str8_lit("lld-link"))) { return Linker_lld; }
return Linker_Null;
}
@@ -372,7 +372,7 @@ t_cl_version(void)
}
internal String8
t_radlink_path(void)
t_linker_path(void)
{
local_persist String8 path = {0};
if(g_linker_path.size != 0)
@@ -384,9 +384,9 @@ t_radlink_path(void)
ArenaParams params = { .reserve_size = sizeof(buffer), .commit_size = sizeof(buffer), .optional_backing_buffer = buffer };
Arena *arena = arena_alloc_(&params);
#if OS_WINDOWS
path = full_path_from_path(arena, str8_lit("radlink.exe"));
path = str8f(arena, "%S/radlink.exe", get_process_info()->binary_path);
#else
path = full_path_from_path(arena, str8_lit("radlink"));
path = str8f(arena, "%S/radlink", get_process_info()->binary_path);
#endif
AssertAlways(path.size);
}
@@ -444,7 +444,8 @@ t_src_path(void)
local_persist U8 path[4096] = {0};
if (path[0] == 0) {
Temp scratch = scratch_begin(0, 0);
String8 src = str8f(scratch.arena, "%S/src", t_cwd_path());
String8 root = str8_chop_last_slash(get_process_info()->binary_path);
String8 src = str8f(scratch.arena, "%S/src", root);
MemoryCopyStr8(path, src);
path[src.size] = 0;
scratch_end(scratch);
@@ -880,7 +881,7 @@ t_invoke_linkerf(char *fmt, ...)
va_start(args, fmt);
String8 cmdl = push_str8fv(scratch.arena, fmt, args);
va_end(args);
B32 is_ok = t_invoke(t_radlink_path(), cmdl, max_U64);
B32 is_ok = t_invoke(t_linker_path(), cmdl, max_U64);
scratch_end(scratch);
return is_ok;
}
+2 -2
View File
@@ -50,7 +50,7 @@ internal String8 t_radbin_path(void);
internal String8 t_cl_path(void);
internal String8 t_clang_path(void);
internal String8 t_gcc_path(void);
internal String8 t_radlink_path(void);
internal String8 t_linker_path(void);
internal String8 t_cwd_path(void);
internal String8 t_src_path(void);
@@ -60,7 +60,7 @@ internal B32 t_invoke_cl(char *fmt, ...);
internal B32 t_invoke_linkerf(char *fmt, ...);
internal B32 t_invoke_radbin(char *fmt, ...);
internal void t_kill_all(String8 pattern);
#define t_invoke_linker_timeout(c, t) T_Ok(t_invoke(t_radlink_path(), c, t))
#define t_invoke_linker_timeout(c, t) T_Ok(t_invoke(t_linker_path(), c, t))
#define t_invoke_linker_timeoutf(t, f, ...) t_invoke_linker_timeout(push_str8f(arena, f, ##__VA_ARGS__), t)
#define t_invoke_linker(c) t_invoke_linker_timeout(c, max_U64)