aboutsummaryrefslogtreecommitdiff
path: root/src/codegen.cpp
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2019-05-15 21:47:15 -0400
committerAndrew Kelley <andrew@ziglang.org>2019-05-15 21:50:56 -0400
commit6b36b756eb4b4c26b98d405310680ebe5679d111 (patch)
tree372ff21670a553664b443e08aae5601187d51bf4 /src/codegen.cpp
parentb64e6cb8130ca0ef7deca2191a8312edc7f2ce41 (diff)
downloadzig-6b36b756eb4b4c26b98d405310680ebe5679d111.tar.gz
zig-6b36b756eb4b4c26b98d405310680ebe5679d111.zip
fix static builds of zig from requiring c compiler
to be installed when linking libc. When zig links against libc, it requires a dynamic linker path. Usually this can be determined based on the architecture and operating system components of the target. However on some systems this is not correct; because of this zig checks its own dynamic linker. When zig is statically linked, this information is not available, and so it resorts to using cc -print-filename=foo to find the dynamic linker path. Before this commit, Zig incorrectly exited with an error if there was no c compiler installed. Now, Zig falls back to the dynamic linker determined based on the arch and os when no C compiler can be found.
Diffstat (limited to 'src/codegen.cpp')
-rw-r--r--src/codegen.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/codegen.cpp b/src/codegen.cpp
index 1d7d543a49..ecdee4e9e5 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -8121,7 +8121,7 @@ static void detect_dynamic_linker(CodeGen *g) {
for (size_t i = 0; possible_ld_names[i] != NULL; i += 1) {
const char *lib_name = possible_ld_names[i];
if ((err = zig_libc_cc_print_file_name(lib_name, result, false, true))) {
- if (err != ErrorCCompilerCannotFindFile) {
+ if (err != ErrorCCompilerCannotFindFile && err != ErrorNoCCompilerInstalled) {
fprintf(stderr, "Unable to detect native dynamic linker: %s\n", err_str(err));
exit(1);
}