zig

commit 308e7d531452a06be815218f781ecd40afe451ac (tree)
parent f7bf61a98349c7d888e8808047912c482a2d2560
Author: meme <meme@users.noreply.github.com>
Date:   Fri, 27 Sep 2019 17:33:07 -0400

fix building static Android executables

Diffstat:
M
src/link.cpp
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/link.cpp b/src/link.cpp
@@ -1653,7 +1653,7 @@ static void construct_linker_job_elf(LinkJob *lj) {
         soname = buf_sprintf("lib%s.so.%" ZIG_PRI_usize, buf_ptr(g->root_out_name), g->version_major);
     }
 
-    if (target_requires_pie(g->zig_target) && !is_dyn_lib) {
+    if (target_requires_pie(g->zig_target) && !is_dyn_lib && g->libc != nullptr) {
         lj->args.append("-pie");
     }
 
@@ -1821,7 +1821,7 @@ static void construct_linker_job_elf(LinkJob *lj) {
     }
 
     // crt end
-    if (target_is_android(g->zig_target) && g->have_dynamic_link) {
+    if (target_is_android(g->zig_target) && g->libc != nullptr) {
         lj->args.append(get_libc_crt_file(g, "crtend_android.o"));
     } else if (lj->link_in_crt && target_libc_needs_crti_crtn(g->zig_target)) {
         lj->args.append(get_libc_crt_file(g, "crtn.o"));