authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-03-12 18:28:32-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-03-12 18:28:32-04:00
logcf699ee068c2b1159ebb23b96999f7f828c0ec1f
treeabc94b129729e0a16fe69e2afbd2c3394eaa4408
parent9741b2aab47ec899276a52827f72509fc322388a
signaturelock-open Commit is signed but in an unrecognized format.

don't resolve dynamic linker for static executables

1 files changed, 1 insertions(+), 1 deletions(-)

src/codegen.cpp+1-1
...@@ -7893,7 +7893,7 @@ static void init(CodeGen *g) {...@@ -7893,7 +7893,7 @@ static void init(CodeGen *g) {
7893}7893}
78947894
7895static void detect_dynamic_linker(CodeGen *g) {7895static void detect_dynamic_linker(CodeGen *g) {
7896 if (g->dynamic_linker_path != nullptr)7896 if (g->dynamic_linker_path != nullptr || g->is_static)
7897 return;7897 return;
7898 const char *standard_ld_path = target_dynamic_linker(g->zig_target);7898 const char *standard_ld_path = target_dynamic_linker(g->zig_target);
7899 if (standard_ld_path == nullptr)7899 if (standard_ld_path == nullptr)