Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dynamic_linker_path can be null on some targets

master
Andrew Kelley 2019-03-07 12:21:27 -05:00
parent ce76de35f1
commit ffaa4f0a87
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/codegen.cpp
View File

@ -7906,6 +7906,9 @@ static void init(CodeGen *g) {
static void detect_dynamic_linker(CodeGen *g) {
if (g->dynamic_linker_path != nullptr)
return;
const char *standard_ld_path = target_dynamic_linker(g->zig_target);
if (standard_ld_path == nullptr)
return;
if (g->zig_target->is_native) {
// target_dynamic_linker is usually correct. However on some systems, such as NixOS
@ -7944,8 +7947,7 @@ static void detect_dynamic_linker(CodeGen *g) {
#endif
}
// Otherwise go with the standard linker path.
g->dynamic_linker_path = buf_create_from_str(target_dynamic_linker(g->zig_target));
g->dynamic_linker_path = buf_create_from_str(standard_ld_path);
}
static void detect_libc(CodeGen *g) {
@ -9091,7 +9093,7 @@ static Error check_cache(CodeGen *g, Buf *manifest_dir, Buf *digest, bool *c_obj
cache_buf(ch, &g->libc->msvc_lib_dir);
cache_buf(ch, &g->libc->kernel32_lib_dir);
}
cache_buf(ch, g->dynamic_linker_path);
cache_buf_opt(ch, g->dynamic_linker_path);
*c_objects_generated = gen_c_objects(g);